X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbuild.mk.sample;h=7368a22224038151df1ca27c49c3994347938347;hb=1cce2f51656cfbd8c7933a914a4bd981792aa1e6;hp=44b2537f67dbf341b2add9c8822bf118f27f5703;hpb=f7963d3f11e67375b8c6ecbd71e56f0d0ac262dd;p=ghc-hetmet.git

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 44b2537..7368a22 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -25,6 +25,8 @@
 # Which warnings we like to use
 MyWarningOpts   = -W -fno-warn-unused-matches -fwarn-unused-imports
 
+GhcLibWays = v
+
 # -------- 1. A Performance/Distribution build--------------------------------
 
 ifeq "$(BuildFlavour)" "perf"
@@ -35,8 +37,8 @@ SRC_HC_OPTS     = -O -H64m
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2 -fgenerics
-GhcLibWays      = p
+GhcLibHcOpts    = -O2 -XGenerics
+GhcLibWays     += p
 
 endif
 
@@ -44,11 +46,10 @@ endif
 
 ifeq "$(BuildFlavour)" "quickest"
 
-SRC_HC_OPTS     = -H64m -Onot -fasm
+SRC_HC_OPTS     = -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -fasm
-GhcLibHcOpts    = -Onot -fasm
-GhcLibWays      =
+GhcStage2HcOpts = -O0 -fasm
+GhcLibHcOpts    = -O0 -fasm
 SplitObjs       = NO
 
 endif
@@ -57,11 +58,10 @@ endif
 
 ifeq "$(BuildFlavour)" "quick"
 
-SRC_HC_OPTS     = -H64m -Onot -fasm
+SRC_HC_OPTS     = -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -fasm
+GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts    = -O -fasm
-GhcLibWays      =
 SplitObjs       = NO
 
 endif
@@ -72,7 +72,6 @@ ifeq "$(BuildFlavour)" "devel1"
 
 SRC_HC_OPTS     = -H64m -O -fasm $(MyWarningOpts)
 GhcLibHcOpts    = -O -dcore-lint $(MyWarningOpts)
-GhcLibWays      =
 GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG
 GhcStage2HcOpts = -Rghc-timing -O -fasm
 SplitObjs = NO
@@ -85,7 +84,6 @@ ifeq "$(BuildFlavour)" "devel2"
 
 SRC_HC_OPTS     = -H64m -O -fasm $(MyWarningOpts)
 GhcLibHcOpts    = -O -dcore-lint $(MyWarningOpts)
-GhcLibWays      =
 GhcStage1HcOpts = -Rghc-timing -O -fasm
 GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG
 SplitObjs = NO