diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-06-03 19:21:26 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-06-03 19:21:26 +0000 |
| commit | f37aa98097f82045a0ac3087c9876054f55e5609 (patch) | |
| tree | 14a69a13f4f5736894f56565273bdba60484d39e /tests | |
| parent | d9567a58e6436442eaa793541ebee552b69d431c (diff) | |
Propagate $shlibpath_var not to use LD_LIBRARY_PATH (OSX and friends)
(based on a llvm commit by Jeffrey Yasskin :p)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index df00049..ffd05bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh TESTS_ENVIRONMENT = -TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH +TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/.libs:$$PATH TESTS = *.test diff --git a/tests/Makefile.in b/tests/Makefile.in index 1c5295a..c8164bd 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -122,6 +122,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ @@ -178,8 +179,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh -TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \ +TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \ PATH=$(top_builddir)/src/.libs:$$PATH TESTS = *.test all: all-am |