[commit: ghc] master: Optimistically assume that LD_LIBRARY_PATH works for all platforms (387c4d1)

Ian Lynagh igloo at earth.li
Tue Mar 19 02:43:18 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/387c4d1bf720b2c9d67bfaed573ba1c5ba47138e

>---------------------------------------------------------------

commit 387c4d1bf720b2c9d67bfaed573ba1c5ba47138e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Mar 19 00:46:15 2013 +0000

    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(-)

diff --git a/rules/library-path.mk b/rules/library-path.mk
index d6e3974..5c61abe 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
 





More information about the ghc-commits mailing list