[commit: ghc] master: extend LD_LIBRARY_PATH instead of replacing it (fb41ac5)
Gabor Greif <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/fb41ac5285895c3b5304b1c267197faaea89e8a6 >--------------------------------------------------------------- commit fb41ac5285895c3b5304b1c267197faaea89e8a6 Author: Gabor Greif <[email protected]> Date: Fri Oct 12 11:25:29 2012 +0200 extend LD_LIBRARY_PATH instead of replacing it >--------------------------------------------------------------- rules/shell-wrapper.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 395968a..86af3ac 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------------- # -# (c) 2009 The University of Glasgow +# (c) 2009-2012 The University of Glasgow # # This file is part of the GHC build system. # @@ -46,9 +46,9 @@ $$(INPLACE_WRAPPER): $$($1_$2_INPLACE) $$($1_$2_INPLACE_SHELL_WRAPPER_EXTRA) ifeq "$$(DYNAMIC_BY_DEFAULT)" "YES" ifeq "$$(TargetOS_CPP)" "linux" - echo 'export LD_LIBRARY_PATH="$$($1_$2_DEP_LIB_DIRS_SEARCHPATH)"' >> $$@ + echo 'export LD_LIBRARY_PATH="$$($1_$2_DEP_LIB_DIRS_SEARCHPATH):$$$$LD_LIBRARY_PATH"' >> $$@ else ifeq "$$(TargetOS_CPP)" "darwin" - echo 'export DYLD_LIBRARY_PATH="$$($1_$2_DEP_LIB_DIRS_SEARCHPATH)"' >> $$@ + echo 'export DYLD_LIBRARY_PATH="$$($1_$2_DEP_LIB_DIRS_SEARCHPATH):$$$$DYLD_LIBRARY_PATH"' >> $$@ endif endif ifeq "$$($1_$2_SHELL_WRAPPER)" "YES"