X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbuild.mk.sample;h=911f5025ec6f52e7f47030695653281a02085083;hb=6bfb3fcdbe0ee6080cb86a72518de1fd5646d610;hp=3f55836d0da4770935971e29418772c414433853;hpb=1dc6b07eb93f4ff2f0e9f89dbdfa0ec4e051291f;p=ghc-hetmet.git

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 3f55836..911f502 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -5,60 +5,105 @@
 # overall build type, and then tweak the options in the relevant section
 # below.
 
-BuildFlavour = devel
+# Uncomment one of these to select a build profile below:
+
+# Full build with max optimisation (slow build)
 #BuildFlavour = perf
 
-# -------- Misc. settings -----------------------------------------------------
+# Fastest build (libs unoptimised):
+#BuildFlavour = quickest
+
+# Fast build with optimised libraries:
+#BuildFlavour = quick
+
+# A development build, working on the stage 1 compiler:
+#BuildFlavour = devel1
 
-# Not necessary to set this, but useful if you have other projects checked-out
-# in your source tree.
-ProjectsToBuild = glafp-utils ghc libraries hslibs
+# 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 =
+# perf matches the default settings, repeated here for comparison:
 
-FptoolsHcOpts = -H32m $(MyWarningOpts)
-GhcHcOpts     = -Rghc-timing -DDEBUG
-GhcLibHcOpts  = -dcore-lint -O -H32m  $(MyWarningOpts) -keep-hc-files 
-GhcLibWays    =
+SRC_HC_OPTS     = -O -H64m
+GhcStage1HcOpts = -O -fasm
+GhcStage2HcOpts = -O2 -fasm
+GhcHcOpts       = -Rghc-timing
+GhcLibHcOpts    = -O2 -XGenerics
+GhcLibWays      = p
 
-# Debugging RTS
-GhcRtsHcOpts = -optc-DDEBUG
-GhcRtsCcOpts = -g
-SRC_HC_OPTS  += -lbfd -liberty
+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 -O0 -fasm
+GhcStage1HcOpts = -O -fasm
+GhcStage2HcOpts = -O0 -fasm
+GhcLibHcOpts    = -O0 -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 -O0 -fasm
+GhcStage1HcOpts = -O -fasm
+GhcStage2HcOpts = -O0 -fasm
+GhcLibHcOpts    = -O -fasm
+GhcLibWays      =
+SplitObjs       = NO
 
 endif
 
-# -------- 1. A Performance/Distribution build--------------------------------
+# -------- A Development build (stage 1) -------------------------------------
 
-ifeq "$(BuildFlavour)" "perf"
+ifeq "$(BuildFlavour)" "devel1"
 
-FptoolsHcOpts = -H32m -O $(MyWarningOpts)
-GhcHcOpts     = -Rghc-timing
-GhcLibHcOpts  = -H32m -O $(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
+
+endif
+
+# -------- A Development build (stage 2) -------------------------------------
+
+ifeq "$(BuildFlavour)" "devel2"
 
-GhcLibWays    = p
+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=: