[commit: ghc] master: Hopefully fix build on OS X (98f9759)

[git at git.haskell.org]

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

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

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

commit 98f975961b9db2c2f308295c303028b97bc3239b
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Nov 14 15:36:38 2016 +0000

    Hopefully fix build on OS X
    
    Summary:
    It looks like I broke the OS X build with 55d535da10dd, hopefully this
    should fix it.
    
    Test Plan: Harbourmaster
    
    Reviewers: austin, bgamari, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2705
    
    GHC Trac Issues: #12455


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

98f975961b9db2c2f308295c303028b97bc3239b
 rts/package.conf.in | 68 ++++++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 40 deletions(-)

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 49c572b..17d579f 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -72,28 +72,22 @@ cc-options:
 
 ld-options:
 #ifdef LEADING_UNDERSCORE
-           "-Wl,-u,_ghczmprim_GHCziTypes_Izh_static_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Czh_static_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Fzh_static_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Dzh_static_info"
-         , "-Wl,-u,_base_GHCziPtr_Ptr_static_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Wzh_static_info"
-         , "-Wl,-u,_base_GHCziInt_I8zh_static_info"
-         , "-Wl,-u,_base_GHCziInt_I16zh_static_info"
-         , "-Wl,-u,_base_GHCziInt_I32zh_static_info"
-         , "-Wl,-u,_base_GHCziInt_I64zh_static_info"
-         , "-Wl,-u,_base_GHCziWord_W8zh_static_info"
-         , "-Wl,-u,_base_GHCziWord_W16zh_static_info"
-         , "-Wl,-u,_base_GHCziWord_W32zh_static_info"
-         , "-Wl,-u,_base_GHCziWord_W64zh_static_info"
-         , "-Wl,-u,_base_GHCziStable_StablePtr_static_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Izh_con_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Czh_con_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Fzh_con_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_Dzh_con_info"
-         , "-Wl,-u,_base_GHCziPtr_Ptr_con_info"
+           "-Wl,-u,_base_GHCziInt_I16zh_con_info"
+         , "-Wl,-u,_base_GHCziInt_I32zh_con_info"
+         , "-Wl,-u,_base_GHCziInt_I64zh_con_info"
+         , "-Wl,-u,_base_GHCziInt_I8zh_con_info"
          , "-Wl,-u,_base_GHCziPtr_FunPtr_con_info"
+         , "-Wl,-u,_base_GHCziPtr_Ptr_con_info"
          , "-Wl,-u,_base_GHCziStable_StablePtr_con_info"
+         , "-Wl,-u,_base_GHCziWord_W16zh_con_info"
+         , "-Wl,-u,_base_GHCziWord_W32zh_con_info"
+         , "-Wl,-u,_base_GHCziWord_W64zh_con_info"
+         , "-Wl,-u,_base_GHCziWord_W8zh_con_info"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_Czh_con_info"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_Dzh_con_info"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_Fzh_con_info"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_Izh_con_info"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_Wzh_con_info"
          , "-Wl,-u,_ghczmprim_GHCziTuple_Z0T_closure"
          , "-Wl,-u,_ghczmprim_GHCziTypes_False_closure"
          , "-Wl,-u,_ghczmprim_GHCziTypes_True_closure"
@@ -169,28 +163,22 @@ ld-options:
          , "-Wl,-u,_hs_atomicwrite64"
 #endif
 #else
-           "-Wl,-u,ghczmprim_GHCziTypes_Izh_static_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Czh_static_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Fzh_static_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Dzh_static_info"
-         , "-Wl,-u,base_GHCziPtr_Ptr_static_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Wzh_static_info"
-         , "-Wl,-u,base_GHCziInt_I8zh_static_info"
-         , "-Wl,-u,base_GHCziInt_I16zh_static_info"
-         , "-Wl,-u,base_GHCziInt_I32zh_static_info"
-         , "-Wl,-u,base_GHCziInt_I64zh_static_info"
-         , "-Wl,-u,base_GHCziWord_W8zh_static_info"
-         , "-Wl,-u,base_GHCziWord_W16zh_static_info"
-         , "-Wl,-u,base_GHCziWord_W32zh_static_info"
-         , "-Wl,-u,base_GHCziWord_W64zh_static_info"
-         , "-Wl,-u,base_GHCziStable_StablePtr_static_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Izh_con_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Czh_con_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Fzh_con_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_Dzh_con_info"
-         , "-Wl,-u,base_GHCziPtr_Ptr_con_info"
+           "-Wl,-u,base_GHCziInt_I16zh_con_info"
+         , "-Wl,-u,base_GHCziInt_I32zh_con_info"
+         , "-Wl,-u,base_GHCziInt_I64zh_con_info"
+         , "-Wl,-u,base_GHCziInt_I8zh_con_info"
          , "-Wl,-u,base_GHCziPtr_FunPtr_con_info"
+         , "-Wl,-u,base_GHCziPtr_Ptr_con_info"
          , "-Wl,-u,base_GHCziStable_StablePtr_con_info"
+         , "-Wl,-u,base_GHCziWord_W16zh_con_info"
+         , "-Wl,-u,base_GHCziWord_W32zh_con_info"
+         , "-Wl,-u,base_GHCziWord_W64zh_con_info"
+         , "-Wl,-u,base_GHCziWord_W8zh_con_info"
+         , "-Wl,-u,ghczmprim_GHCziTypes_Czh_con_info"
+         , "-Wl,-u,ghczmprim_GHCziTypes_Dzh_con_info"
+         , "-Wl,-u,ghczmprim_GHCziTypes_Fzh_con_info"
+         , "-Wl,-u,ghczmprim_GHCziTypes_Izh_con_info"
+         , "-Wl,-u,ghczmprim_GHCziTypes_Wzh_con_info"
          , "-Wl,-u,ghczmprim_GHCziTuple_Z0T_closure"
          , "-Wl,-u,ghczmprim_GHCziTypes_False_closure"
          , "-Wl,-u,ghczmprim_GHCziTypes_True_closure"