X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=20a98a00d8488b917e95c29c3440c629698ff5fc;hp=9390d02c23d8d09e54306f27f2bddb310b27745e;hb=9efc323b5b57a0b4d50008c942a90a45dc51ee2d;hpb=d0249441e5f3fbcff627aa5a2bec3bcdca87db48

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 9390d02..20a98a0 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -1,13 +1,29 @@
 
+WERROR          = -Werror
+
 HADDOCK_DOCS    = YES
-SRC_CC_OPTS     = -Werror
-SRC_HC_OPTS     = -Werror -H64m -Onot -fasm
+HSCOLOUR_SRCS   = YES
+SRC_CC_OPTS     = $(WERROR)
+SRC_HC_OPTS     = $(WERROR) -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -fasm
-GhcLibHcOpts    = -O -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
 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
+