[commit: ghc] master: inplace: Don't add empty component to LD_LIBRARY_PATH when it is empty (fe0d289)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fe0d289de466b0c34a04350c6f7c096d9a588ad0/ghc

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

commit fe0d289de466b0c34a04350c6f7c096d9a588ad0
Author: Reid Barton <rwbarton at gmail.com>
Date:   Mon Jan 12 10:56:58 2015 -0500

    inplace: Don't add empty component to LD_LIBRARY_PATH when it is empty
    
    Summary: Avoids a confusing inconsistency when testing #9386 (about ghci finding .so files in .).
    
    Test Plan: validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: carter, thomie
    
    Differential Revision: https://phabricator.haskell.org/D593
    
    GHC Trac Issues: #9386


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

fe0d289de466b0c34a04350c6f7c096d9a588ad0
 rules/library-path.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/library-path.mk b/rules/library-path.mk
index 5dd5588..dbfd4be 100644
--- a/rules/library-path.mk
+++ b/rules/library-path.mk
@@ -14,8 +14,8 @@
 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"
+prependLibraryPath = export DYLD_LIBRARY_PATH="$1$${DYLD_LIBRARY_PATH:+:$$DYLD_LIBRARY_PATH}"
 else
-prependLibraryPath = export LD_LIBRARY_PATH="$1:$$LD_LIBRARY_PATH"
+prependLibraryPath = export LD_LIBRARY_PATH="$1$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"
 endif