OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add layer of indirection to differentiate LD_LIBRARY_PATH vs. DYLD_LIBRARY_PATH.

This commit is contained in:
Graydon Hoare 2011-03-23 13:10:30 -07:00
parent f052d9b4c2
commit a978d53425
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -30,6 +30,7 @@ ifeq ($(CFG_OSTYPE), FreeBSD)
CFG_GCC_LINK_FLAGS += -m32 CFG_GCC_LINK_FLAGS += -m32
endif endif
CFG_UNIXY := 1 CFG_UNIXY := 1
CFG_LDENV := LD_LIBRARY_PATH
endif endif
ifeq ($(CFG_OSTYPE), Linux) ifeq ($(CFG_OSTYPE), Linux)
@ -41,11 +42,13 @@ ifeq ($(CFG_OSTYPE), Linux)
CFG_GCC_LINK_FLAGS += -m32 CFG_GCC_LINK_FLAGS += -m32
endif endif
CFG_UNIXY := 1 CFG_UNIXY := 1
CFG_LDENV := LD_LIBRARY_PATH
endif endif
ifeq ($(CFG_OSTYPE), Darwin) ifeq ($(CFG_OSTYPE), Darwin)
CFG_LIB_NAME=lib$(1).dylib CFG_LIB_NAME=lib$(1).dylib
CFG_UNIXY := 1 CFG_UNIXY := 1
CFG_LDENV := DYLD_LIBRARY_PATH
CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
# Darwin has a very blurry notion of "64 bit", and claims it's running # Darwin has a very blurry notion of "64 bit", and claims it's running
# "on an i386" when the whole userspace is 64-bit and the compiler # "on an i386" when the whole userspace is 64-bit and the compiler
@ -90,9 +93,9 @@ ifdef CFG_UNIXY
CFG_EXE_SUFFIX := CFG_EXE_SUFFIX :=
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR) CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR)
CFG_RUN_TARG=\ CFG_RUN_TARG=\
LD_LIBRARY_PATH=$(dir $(firstword $(1))):$(CFG_LDPATH) $(1) $(CFG_LDENV)=$(dir $(firstword $(1))):$(CFG_LDPATH) $(1)
CFG_RUN_TEST=\ CFG_RUN_TEST=\
LD_LIBRARY_PATH=$(dir $(firstword $(1))):$(CFG_LDPATH) \ $(CFG_LDENV)=$(dir $(firstword $(1))):$(CFG_LDPATH) \
$(CFG_VALGRIND) $(1) $(CFG_VALGRIND) $(1)
CFG_BOOT_NATIVE := 1 CFG_BOOT_NATIVE := 1