GHC new build system megapatch

[ghc-hetmet.git] / mk / build.mk.sample

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 911f502..7368a22 100644 (file)
--- 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
 
 # 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"
 # -------- 1. A Performance/Distribution build--------------------------------
 
 ifeq "$(BuildFlavour)" "perf"

@@ -36,7 +38,7 @@ GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts       = -Rghc-timing
 GhcLibHcOpts    = -O2 -XGenerics
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts       = -Rghc-timing
 GhcLibHcOpts    = -O2 -XGenerics

-GhcLibWays      = p
+GhcLibWays     += p

 
 endif
 
 
 endif
 

@@ -48,7 +50,6 @@ SRC_HC_OPTS     = -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts    = -O0 -fasm
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts    = -O0 -fasm

-GhcLibWays      =

 SplitObjs       = NO
 
 endif
 SplitObjs       = NO
 
 endif

@@ -61,7 +62,6 @@ SRC_HC_OPTS     = -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts    = -O -fasm
 GhcStage1HcOpts = -O -fasm
 GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts    = -O -fasm

-GhcLibWays      =

 SplitObjs       = NO
 
 endif
 SplitObjs       = NO
 
 endif

@@ -72,7 +72,6 @@ ifeq "$(BuildFlavour)" "devel1"
 
 SRC_HC_OPTS     = -H64m -O -fasm $(MyWarningOpts)
 GhcLibHcOpts    = -O -dcore-lint $(MyWarningOpts)
 
 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
 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)
 
 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
 GhcStage1HcOpts = -Rghc-timing -O -fasm
 GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG
 SplitObjs = NO