Check Cabal packages when validating

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

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 80970fe..b70a045 100644 (file)
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -4,8 +4,9 @@
 WERROR          = -Werror
 
 HADDOCK_DOCS    = YES
-SRC_CC_OPTS     += $(WERROR)
-SRC_HC_OPTS     += $(WERROR) -H64m -O0 -fasm
+SRC_CC_OPTS     += -Wall $(WERROR)
+SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0 -fasm
+
 GhcStage1HcOpts += -O -fasm
 
 GhcStage2HcOpts += -O -fasm
@@ -14,11 +15,13 @@ GhcStage2HcOpts += -O -fasm
 # running of the tests, and faster building of the utils to be installed
 
 GhcLibHcOpts    += -O -fasm -dcore-lint
-GhcLibWays      = v
+GhcLibWays     := $(filter v dyn,$(GhcLibWays))
 SplitObjs       = NO
 NoFibWays       =
 STRIP           = :
 
+CHECK_PACKAGES = YES
+
 ifeq "$(ValidateHpc)" "YES"
 GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
 endif
@@ -27,3 +30,8 @@ GhcStage2HcOpts += -XGenerics -DDEBUG
 GhcLibHcOpts    += -XGenerics
 endif
 
+# Temporarily turn off unused-do-bind warnings for the time package
+libraries/time_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-do-bind
+# On Windows, there are also some unused import warnings
+libraries/time_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
+