[commit: ghc] master: Turn object splitting off when we use the dynamic way (9f03486)

Ian Lynagh igloo at earth.li
Fri Mar 22 20:12:24 CET 2013


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

On branch  : master

https://github.com/ghc/ghc/commit/9f03486aae0e65ffb18d1314f379ee7418ad4c6f

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

commit 9f03486aae0e65ffb18d1314f379ee7418ad4c6f
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Mar 22 14:08:55 2013 +0000

    Turn object splitting off when we use the dynamic way
    
    There's no point splitting objects when we're going to be dynamically
    linking. Plus it breaks compilation on OSX x86.

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

 compiler/main/DynFlags.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ecf6acb..a03f812 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1067,7 +1067,12 @@ wayGeneralFlags _ WayNDP      = []
 wayUnsetGeneralFlags :: Platform -> Way -> [GeneralFlag]
 wayUnsetGeneralFlags _ WayThreaded = []
 wayUnsetGeneralFlags _ WayDebug    = []
-wayUnsetGeneralFlags _ WayDyn      = [Opt_Static]
+wayUnsetGeneralFlags _ WayDyn      = [Opt_Static,
+                                      -- There's no point splitting objects
+                                      -- when we're going to be dynamically
+                                      -- linking. Plus it breaks compilation
+                                      -- on OSX x86.
+                                      Opt_SplitObjs]
 wayUnsetGeneralFlags _ WayProf     = []
 wayUnsetGeneralFlags _ WayEventLog = []
 wayUnsetGeneralFlags _ WayPar      = []





More information about the ghc-commits mailing list