diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-04-10 16:34:58 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-04-10 16:34:58 +0800 |
| commit | 5344f8404a0ec0cec250bee1f92527950f492f29 (patch) | |
| tree | 12754fa5a61228e7945eb7b29b962b6a24925b8e | |
| parent | c41f77e879ac68a81a8ee0bb37ba27b42c850cee (diff) | |
| download | haskell-wip/angerman/8.10-fix-19640.tar.gz | |
Partial Revert "[darwin] stop the DYLD_LIBRARY_PATH madness"wip/angerman/8.10-fix-19640
This partially reverts commit 820b0766984d42c06c977a6c32da75c429106f7f
to fix #19640
| -rw-r--r-- | rules/library-path.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rules/library-path.mk b/rules/library-path.mk index 92511f2c94..9a398eebf0 100644 --- a/rules/library-path.mk +++ b/rules/library-path.mk @@ -13,8 +13,9 @@ # $1 = paths to prepend ifeq "$(TargetOS_CPP)" "mingw32" prependLibraryPath = $(error Do not know how to prependLibraryPath on Windows) -else ifneq "$(TargetOS_CPP)" "darwin" -prependLibraryPath = export LD_LIBRARY_PATH="$1$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" +else ifeq "$(TargetOS_CPP)" "darwin" +prependLibraryPath = export DYLD_LIBRARY_PATH="$1$${DYLD_LIBRARY_PATH:+:$$DYLD_LIBRARY_PATH}" else -prependLibraryPath = +prependLibraryPath = export LD_LIBRARY_PATH="$1$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" endif + |