sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3/s4:build: honor library path from environment

Browse Source 
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
This commit is contained in:
Björn Jacke 2009-07-04 01:07:15 +02:00
parent cfacece9ed
commit 077808f916
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/Makefile.in
View File

@ -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) \

2
source3/samba4.mk
View File

@ -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 \

2
source4/Makefile
View File

@ -163,7 +163,7 @@ manpages:: $(MANPAGES)
all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
everything:: all
LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir)
LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR)
# 'make testsuite' creates all binaries which are
# needed by samba3's 'make test' and the build-farm