X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbuild.mk.sample;h=34d260a712a98437f3f2264342edcb604880b55e;hb=b6d8ea325f1edc435b58782ae6880a6eee542aa8;hp=b0b66d34783f56544fef2bbb3c72ef956a831f0b;hpb=3321ef43e1f5792ff97f69c665a2703450c6081d;p=ghc-hetmet.git

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index b0b66d3..34d260a 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -7,55 +7,99 @@
 
 # Uncomment one of these to select a build profile below:
 
-#BuildFlavour = devel
+# Full build with max optimisation (slow build)
 #BuildFlavour = perf
 
-# -------- Misc. settings -----------------------------------------------------
+# Fastest build (libs unoptimised):
+#BuildFlavour = quickest
 
-# Not necessary to set this, but useful if you have other projects checked-out
-# in your source tree:
-# ProjectsToBuild = glafp-utils ghc libraries hslibs
+# Fast build with optimised libraries:
+#BuildFlavour = quick
+
+# A development build, working on the stage 1 compiler:
+#BuildFlavour = devel1
+
+# A development build, working on the stage 2 compiler:
+#BuildFlavour = devel2
 
 # Which warnings we like to use
 MyWarningOpts   = -W -fno-warn-unused-matches -fwarn-unused-imports
 
-# -------- 1. A Development build --------------------------------------------
+# -------- 1. A Performance/Distribution build--------------------------------
 
-ifeq "$(BuildFlavour)" "devel"
+ifeq "$(BuildFlavour)" "perf"
 
-GhcCompilerWays =
+SRC_HC_OPTS   = -H32m -O2
+GhcHcOpts     = -Rghc-timing
+GhcLibHcOpts  =
+GhcLibWays    = p
 
-SRC_HC_OPTS   = -H32m -O0 $(MyWarningOpts)
-GhcHcOpts     = -Rghc-timing -DDEBUG
-GhcLibHcOpts  = -O -dcore-lint $(MyWarningOpts) -keep-hc-files 
-GhcLibWays    =
+endif
 
-# profiled RTS
-#GhcRtsCcOpts =  -pg -g
+# -------- A Fast build ------------------------------------------------------
 
-# Optimised/profiled RTS
-#GhcRtsCcOpts = -O2 -pg
+ifeq "$(BuildFlavour)" "quickest"
 
-#GhcRtsWithFrontPanel = YES
-#SRC_HC_OPTS += `gtk-config --libs`
+SRC_HC_OPTS     = -H64m -Onot -fasm
+GhcStage1HcOpts = -O -fasm
+GhcStage2HcOpts = -Onot -fasm
+GhcLibHcOpts    = -Onot -fasm
+GhcLibWays      =
+SplitObjs       = NO
 
-SplitObjs = NO
+endif
 
-NoFibWays =
-SRC_RUNTEST_OPTS += +RTS -H10m -RTS
-STRIP=:
+# -------- A Fast build with optimised libs ----------------------------------
+
+ifeq "$(BuildFlavour)" "quick"
+
+SRC_HC_OPTS     = -H64m -Onot -fasm
+GhcStage1HcOpts = -O -fasm
+GhcStage2HcOpts = -Onot -fasm
+GhcLibHcOpts    = -O -fasm
+GhcLibWays      =
+SplitObjs       = NO
 
 endif
 
-# -------- 1. A Performance/Distribution build--------------------------------
+# -------- A Development build (stage 1) -------------------------------------
 
-ifeq "$(BuildFlavour)" "perf"
+ifeq "$(BuildFlavour)" "devel1"
 
-SRC_HC_OPTS   = -H32m -O $(MyWarningOpts)
-GhcHcOpts     = -Rghc-timing
-GhcLibHcOpts  =
+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
 
-GhcLibWays    = p
+endif
+
+# -------- A Development build (stage 2) -------------------------------------
+
+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
 
-#GhcRtsCcOpts = -O2 -fomit-frame-pointer -mpreferred-stack-boundary=2 -march=pentiumpro
 endif
+
+# -----------------------------------------------------------------------------
+# Other settings that might be useful
+
+# profiled RTS
+#GhcRtsCcOpts =  -pg -g
+
+# Optimised/profiled RTS
+#GhcRtsCcOpts = -O2 -pg
+
+#GhcRtsWithFrontPanel = YES
+#SRC_HC_OPTS += `gtk-config --libs`
+
+# NoFib settings
+NoFibWays =
+STRIP=: