Require HsColour by default

[ghc-hetmet.git] / mk / validate-settings.mk

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 83995e5..20a98a0 100644 (file)
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -2,11 +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