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

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 2c36f87..60501ff 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -1,15 +1,33 @@
+# 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 -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts    = -O -fasm -dcore-lint
-GhcLibWays      =
+SRC_CC_OPTS     += -Wall $(WERROR)
+SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0 -fasm
+
+# Temporary hack until we fix the libraries. See #3263 for details.
+GhcLibHcOpts    += -fno-warn-unused-do-bind
+
+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           = :
-GhcBootLibs     = YES
+
+ifeq "$(ValidateHpc)" "YES"
+GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
+endif
+ifeq "$(ValidateSlow)" "YES"
+GhcStage2HcOpts += -XGenerics -DDEBUG
+GhcLibHcOpts    += -XGenerics
+endif