[commit: ghc] master: fix build failure on Solaris caused by usage of --export-dynamic (fa8940e)

git at git.haskell.org git at git.haskell.org
Tue Oct 18 19:48:21 UTC 2016


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

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

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

commit fa8940e80138fed457e8903d59e2cd011741fa29
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Tue Oct 18 21:47:35 2016 +0200

    fix build failure on Solaris caused by usage of --export-dynamic
    
    Summary:
    This patch fixes build failure on Solaris which is caused
    by usage --export-dynamic linker parameter. This parameter is not
    supported by Solaris linker. The param itself was added by D2590
    
    Reviewers: bgamari, simonmar, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2606


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

fa8940e80138fed457e8903d59e2cd011741fa29
 iserv/ghc.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/iserv/ghc.mk b/iserv/ghc.mk
index cab432a..8497313 100644
--- a/iserv/ghc.mk
+++ b/iserv/ghc.mk
@@ -29,10 +29,14 @@ iserv_stage2_dyn_MORE_HC_OPTS += -threaded
 # of overhead to startup and increases the binary sizes) but if you
 # need it there's no alternative.
 ifeq "$(TargetElf)" "YES"
+ifneq "$(TargetOS_CPP)" "solaris2"
+# The Solaris linker does not support --export-dynamic option. It also
+# does not need it since it exports all dynamic symbols by default
 iserv_stage2_MORE_HC_OPTS += -optl-Wl,--export-dynamic
 iserv_stage2_p_MORE_HC_OPTS += -optl-Wl,--export-dynamic
 iserv_stage2_dyn_MORE_HC_OPTS += -optl-Wl,--export-dynamic
 endif
+endif
 
 # Override the default way, because we want a specific version of this
 # program for each way.  Note that it's important to do this even for



More information about the ghc-commits mailing list