X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=80970feb252768208ec4c02febf68d9155bc779b;hb=46d2e100dc2e232f5d76ff9fc6a3f11e07d383ce;hp=394fa9d25899aaccce171743ff54b3e8aa821e01;hpb=0e86b6601ea17d89c7f46b3a902093d4c6020da8;p=ghc-hetmet.git

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 394fa9d..80970fe 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -1,12 +1,29 @@
+# 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
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -fasm
-GhcLibHcOpts    = -O -fasm
-GhcLibWays      =
+SRC_CC_OPTS     += $(WERROR)
+SRC_HC_OPTS     += $(WERROR) -H64m -O0 -fasm
+GhcStage1HcOpts += -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      = v
 SplitObjs       = NO
-NoFibWays =
-STRIP=:
+NoFibWays       =
+STRIP           = :
+
+ifeq "$(ValidateHpc)" "YES"
+GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
+endif
+ifeq "$(ValidateSlow)" "YES"
+GhcStage2HcOpts += -XGenerics -DDEBUG
+GhcLibHcOpts    += -XGenerics
+endif