tidy up autoconfiguration of docbook stuff

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

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 53f635b..e640ade 100644 (file)
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -4,21 +4,20 @@
 WERROR          = -Werror
 
 HADDOCK_DOCS    = YES
-SRC_CC_OPTS     = $(WERROR)
-SRC_HC_OPTS     = $(WERROR) -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
+SRC_CC_OPTS     += -Wall $(WERROR)
+SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0 -fasm
+GhcStage1HcOpts += -O -fasm
 
-GhcStage2HcOpts = -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
+GhcLibHcOpts    += -O -fasm -dcore-lint
 GhcLibWays      = v
 SplitObjs       = NO
 NoFibWays       =
 STRIP           = :
-GhcBootLibs     = YES
 
 ifeq "$(ValidateHpc)" "YES"
 GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/