X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=20a98a00d8488b917e95c29c3440c629698ff5fc;hb=e8043f339e23328e3457696589edaa1ab7d60a64;hp=2c36f87881c1b95baa9524ceb63c8518119e3255;hpb=3e280fcada5656e100ba6bb6535bf240acf33f13;p=ghc-hetmet.git

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 2c36f87..20a98a0 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -2,10 +2,16 @@
 WERROR          = -Werror
 
 HADDOCK_DOCS    = YES
+HSCOLOUR_SRCS   = YES
 SRC_CC_OPTS     = $(WERROR)
 SRC_HC_OPTS     = $(WERROR) -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
+
+GhcStage2HcOpts = -O -fasm
+# Using -O (rather than -O0) here bringes my validate down from 22mins to 16 mins.
+# Compiling stage2 takes longer, but we gain a faster haddock, faster
+# running of the tests, and faster building of the utils to be installed
+
 GhcLibHcOpts    = -O -fasm -dcore-lint
 GhcLibWays      =
 SplitObjs       = NO
@@ -13,3 +19,11 @@ NoFibWays       =
 STRIP           = :
 GhcBootLibs     = YES
 
+ifeq "$(ValidateHpc)" "YES"
+GhcStage2HcOpts += -fhpc -hpcdir $(FPTOOLS_TOP_ABS)/testsuite/hpc_output/
+endif
+ifeq "$(ValidateSlow)" "YES"
+GhcStage2HcOpts += -XGenerics -DDEBUG
+GhcLibHcOpts    += -XGenerics
+endif
+