[commit: ghc] master: Fix specification of -z origin for gold. (26fcbd0)

[git at git.haskell.org]

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

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

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

commit 26fcbd0a40c7bfa785baf4d1ad119ddb3abf05e7
Author: Austin Seipp <austin at well-typed.com>
Date:   Tue Jan 7 01:06:10 2014 -0600

    Fix specification of -z origin for gold.
    
    Gold apparently doesn't recognize `-z origin`, only `-zorigin` it seems.
    
    Authored-by: Ben Gamari <bgamari.foss at gmail.com>
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

26fcbd0a40c7bfa785baf4d1ad119ddb3abf05e7
 rts/ghc.mk                |    2 +-
 rules/distdir-way-opts.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 9ed64c6..1e0b6de 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -195,7 +195,7 @@ else
 ifneq "$$(UseSystemLibFFI)" "YES"
 LIBFFI_LIBS = -Lrts/dist/build -l$$(LIBFFI_NAME)
 ifeq "$$(TargetElf)" "YES"
-LIBFFI_LIBS += -optl-Wl,-rpath -optl-Wl,'$$$$ORIGIN' -optl-Wl,-z -optl-Wl,origin
+LIBFFI_LIBS += -optl-Wl,-rpath -optl-Wl,'$$$$ORIGIN' -optl-Wl,-zorigin
 endif
 
 else
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index a6b7f57..a4f525e 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -136,7 +136,7 @@ ifneq "$4" "0"
 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
+    $$(foreach d,$$($1_$2_TRANSITIVE_DEPS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') -optl-Wl,-zorigin
 else ifeq "$$(TargetOS_CPP)" "darwin"
 $1_$2_$3_GHC_LD_OPTS += -optl-Wl,-headerpad_max_install_names
 endif