From 387c4d1bf720b2c9d67bfaed573ba1c5ba47138e Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 19 Mar 2013 00:46:15 +0000 Subject: Optimistically assume that LD_LIBRARY_PATH works for all platforms other than Windows and OS X. It's known to work on Linux and FreeBSD. --- rules/library-path.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rules') diff --git a/rules/library-path.mk b/rules/library-path.mk index d6e39743e2..5c61abefa3 100644 --- a/rules/library-path.mk +++ b/rules/library-path.mk @@ -11,11 +11,11 @@ # ----------------------------------------------------------------------------- # $1 = paths to prepend -ifeq "$(TargetOS_CPP)" "linux" -prependLibraryPath = export LD_LIBRARY_PATH="$1:$$LD_LIBRARY_PATH" +ifeq "$(TargetOS_CPP)" "mingw32" +prependLibraryPath = $(error Do not know how to prependLibraryPath on Windows) else ifeq "$(TargetOS_CPP)" "darwin" prependLibraryPath = export DYLD_LIBRARY_PATH="$1:$$DYLD_LIBRARY_PATH" else -prependLibraryPath = $(error Do not know how to prependLibraryPath on $(TargetOS_CPP)) +prependLibraryPath = export LD_LIBRARY_PATH="$1:$$LD_LIBRARY_PATH" endif -- cgit v1.2.1