Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.
  • Loading branch information...
commit 9f03486aae0e65ffb18d1314f379ee7418ad4c6f 1 parent 024311c
igfoo authored March 22, 2013

Showing 1 changed file with 6 additions and 1 deletion. Show diff stats Hide diff stats

  1. 7  compiler/main/DynFlags.hs
7  compiler/main/DynFlags.hs
@@ -1067,7 +1067,12 @@ wayGeneralFlags _ WayNDP      = []
1067 1067
 wayUnsetGeneralFlags :: Platform -> Way -> [GeneralFlag]
1068 1068
 wayUnsetGeneralFlags _ WayThreaded = []
1069 1069
 wayUnsetGeneralFlags _ WayDebug    = []
1070  
-wayUnsetGeneralFlags _ WayDyn      = [Opt_Static]
  1070
+wayUnsetGeneralFlags _ WayDyn      = [Opt_Static,
  1071
+                                      -- There's no point splitting objects
  1072
+                                      -- when we're going to be dynamically
  1073
+                                      -- linking. Plus it breaks compilation
  1074
+                                      -- on OSX x86.
  1075
+                                      Opt_SplitObjs]
1071 1076
 wayUnsetGeneralFlags _ WayProf     = []
1072 1077
 wayUnsetGeneralFlags _ WayEventLog = []
1073 1078
 wayUnsetGeneralFlags _ WayPar      = []

0 notes on commit 9f03486

Please sign in to comment.
Something went wrong with that request. Please try again.