From 5344f8404a0ec0cec250bee1f92527950f492f29 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sat, 10 Apr 2021 16:34:58 +0800 Subject: Partial Revert "[darwin] stop the DYLD_LIBRARY_PATH madness" This partially reverts commit 820b0766984d42c06c977a6c32da75c429106f7f to fix #19640 --- rules/library-path.mk | 7 ++++--- 1 file 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 + -- cgit v1.2.1