X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=53f635b3f8b60d0e7d26621234363f12f09561d0;hp=bf665ff19fa3160df16d617906cb3058350cc852;hb=34cc75e1a62638f2833815746ebce0a9114dc26b;hpb=2b1c24ecbcecb2d1a1d4ee482eb8bab5e1e75844

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index bf665ff..53f635b 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -1,13 +1,30 @@
+# DO NOT EDIT!  Instead, create a file mk/validate.mk, whose settings will
+# override these.  See also mk/custom-settings.mk.
+
+WERROR          = -Werror
 
 HADDOCK_DOCS    = YES
-SRC_CC_OPTS     = -Werror
-SRC_HC_OPTS     = -Werror -H64m -Onot -fasm
+SRC_CC_OPTS     = $(WERROR)
+SRC_HC_OPTS     = $(WERROR) -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -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      =
+GhcLibWays      = v
 SplitObjs       = NO
 NoFibWays       =
 STRIP           = :
 GhcBootLibs     = YES
 
+ifeq "$(ValidateHpc)" "YES"
+GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
+endif
+ifeq "$(ValidateSlow)" "YES"
+GhcStage2HcOpts += -XGenerics -DDEBUG
+GhcLibHcOpts    += -XGenerics
+endif
+