[commit: ghc] ghc-8.0: Ensure flags destined for ld are properly passed (d3c18b2)

git at git.haskell.org git at git.haskell.org
Sun Dec 18 21:26:47 UTC 2016


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/d3c18b26e91f835794e4dbc3f5a073f15bca1a74/ghc

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

commit d3c18b26e91f835794e4dbc3f5a073f15bca1a74
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 1 11:28:47 2016 -0500

    Ensure flags destined for ld are properly passed
    
    GHC uses gcc, not ld, for linking. Consequently all flags to be
    interpreted by ld need to be prefixed by -optl,-Wl on the GHC command
    line.
    
    Test Plan: Validate on OpenBSD
    
    Reviewers: austin, rwbarton
    
    Reviewed By: rwbarton
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2776
    
    (cherry picked from commit f48f5a9ebf384e1e157b7b413e1d779f4289ddd2)


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

d3c18b26e91f835794e4dbc3f5a073f15bca1a74
 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 4ebbc0e..4f943a1 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -200,7 +200,7 @@ $1_$2_$3_ALL_LD_OPTS = \
 
 # Options for passing to GHC when we use it for linking
 $1_$2_$3_GHC_LD_OPTS = \
- $$(addprefix -optl, $$($1_$2_$3_ALL_LD_OPTS)) \
+ $$(addprefix -optl-Wl, $$($1_$2_$3_ALL_LD_OPTS)) \
  $$($1_$2_$3_MOST_HC_OPTS)
 
 $1_$2_$3_ALL_AS_OPTS = \



More information about the ghc-commits mailing list