X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=673e542bda6781965241bf81332fcbbfb4cbe109;hb=661c97c65e5fa47177502e592bb763f752b487ac;hp=60501ffcba0939ab8e2ccbed93f97c56df487adb;hpb=4f0beafc3f848566938276dffc728ff5d3cfbdf3;p=ghc-hetmet.git

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 60501ff..673e542 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -5,24 +5,30 @@ WERROR          = -Werror
 
 HADDOCK_DOCS    = YES
 SRC_CC_OPTS     += -Wall $(WERROR)
-SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0 -fasm
+SRC_HC_OPTS     += -Wall $(WERROR) -H64m -O0
 
-# Temporary hack until we fix the libraries. See #3263 for details.
-GhcLibHcOpts    += -fno-warn-unused-do-bind
+GhcStage1HcOpts += -O
 
-GhcStage1HcOpts += -O -fasm
-
-GhcStage2HcOpts += -O -fasm
+GhcStage2HcOpts += -O
 # 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
+GhcLibHcOpts    += -O -dcore-lint
+GhcLibWays     := $(filter v dyn,$(GhcLibWays))
 SplitObjs       = NO
 NoFibWays       =
 STRIP           = :
 
+CHECK_PACKAGES = YES
+
+# dblatex with miktex under msys/mingw can't build the PS and PDF docs,
+# and just building the HTML docs is sufficient to check that the
+# markup is correct, so we turn off PS and PDF doc building when
+# validating.
+BUILD_DOCBOOK_PS  = NO
+BUILD_DOCBOOK_PDF = NO
+
 ifeq "$(ValidateHpc)" "YES"
 GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
 endif
@@ -31,3 +37,13 @@ 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
+
+libraries/haskeline_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
+
+# Temporarily turn off unused-import warnings for the binary package
+libraries/binary_dist-boot_EXTRA_HC_OPTS += -fno-warn-unused-imports
+libraries/binary_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports