[commit: ghc] master: Use -rpath flags on all Elf OSes, not just Linux (ce1094e)

Ian Lynagh igloo at earth.li
Sat Apr 27 03:09:48 CEST 2013


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

On branch  : master

https://github.com/ghc/ghc/commit/ce1094ea87e58f5172f623c61cbb250a3194e0b0

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

commit ce1094ea87e58f5172f623c61cbb250a3194e0b0
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Apr 27 00:28:31 2013 +0100

    Use -rpath flags on all Elf OSes, not just Linux
    
    Patch from pgj; part of #7819.

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

 rules/distdir-way-opts.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index c78723d..acf6882 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -125,7 +125,7 @@ $1_$2_$3_ALL_HC_OPTS = \
 
 ifeq "$3" "dyn"
 ifneq "$4" "0"
-ifeq "$$(TargetOS_CPP)" "linux"
+ifeq "$$(TargetElf)" "YES"
 $1_$2_$3_GHC_LD_OPTS += \
     -fno-use-rpaths \
     $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') -optl-Wl,-z -optl-Wl,origin





More information about the ghc-commits mailing list