diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-04-02 15:04:53 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-04-05 20:46:21 -0400 |
| commit | 403bf88c568199d8d2a272a041faba96a47a5276 (patch) | |
| tree | 43021ba47a3578631c71a58716dceab3dc85cfcf /rules | |
| parent | bfe8ef8e577a41ce9f29cb5f7879368f5e4b5897 (diff) | |
| download | haskell-403bf88c568199d8d2a272a041faba96a47a5276.tar.gz | |
Revert "[ci/arm/darwin/testsuite] Forwards ports from GHC-8.10"
This reverts commit 0cbdba2768d84a0f6832ae5cf9ea1e98efd739da.
Diffstat (limited to 'rules')
| -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 + |