diff options
| author | Gabor Greif <ggreif@gmail.com> | 2012-10-12 11:25:29 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2012-10-24 10:28:41 +0200 |
| commit | fb41ac5285895c3b5304b1c267197faaea89e8a6 (patch) | |
| tree | 809aa74001b4858537869620bbbc96dbc03d498f /rules/shell-wrapper.mk | |
| parent | a58b2d02e8c9b1ad9d630f6d0e0e01781aa2e278 (diff) | |
| download | haskell-fb41ac5285895c3b5304b1c267197faaea89e8a6.tar.gz | |
extend LD_LIBRARY_PATH instead of replacing it
Diffstat (limited to 'rules/shell-wrapper.mk')
| -rw-r--r-- | 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 395968a0d9..86af3ac8d5 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" |