summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-07-04 01:07:15 +0200
committerBjörn Jacke <bj@sernet.de>2009-07-04 01:14:24 +0200
commit077808f91610e70c2105b837a2704842191d1e3c (patch)
treef351e255de776b8b3234f42a0e72d8a8d917f399 /source3
parentcfacece9ed96dc46c12f20990110c6528080bc32 (diff)
downloadsamba-077808f91610e70c2105b837a2704842191d1e3c.tar.gz
samba-077808f91610e70c2105b837a2704842191d1e3c.tar.bz2
samba-077808f91610e70c2105b837a2704842191d1e3c.zip
s3/s4:build: honor library path from environment
we may not throw away LD_LIBRARY_PATH and friends as they sometimes contain important information. Some of the build farm machines for example have the python lib path in there - we can't run make test when we suddenly forget how to use python
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/samba4.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 01ab5f0a58..dd133df3b8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3203,7 +3203,7 @@ valgrindtest:: all torture timelimit
SELFTEST_FORMAT = plain
selftestdir = ../selftest
-S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin"
+S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
selftest:: all torture timelimit
@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
diff --git a/source3/samba4.mk b/source3/samba4.mk
index e63a8453c0..653ae25464 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -172,7 +172,7 @@ everything:: $(patsubst %,%4,$(BINARIES))
setup:
@ln -sf ../source4/setup setup
-S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
+S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared:$$$(LIB_PATH_VAR)"
SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" PYTHON="$(PYTHON)" PERL="$(PERL)" \
$(PERL) $(selftestdir)/selftest.pl --prefix=st4 \