X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=e250fa6fb42515ff20e31e3c13bcd2d63e323e17;hp=673e542bda6781965241bf81332fcbbfb4cbe109;hb=HEAD;hpb=ebbeaf645c3bed3c8befc1cf50c1529bde191bba

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 673e542..e250fa6 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -18,10 +18,13 @@ GhcLibHcOpts    += -O -dcore-lint
 GhcLibWays     := $(filter v dyn,$(GhcLibWays))
 SplitObjs       = NO
 NoFibWays       =
-STRIP           = :
+STRIP_CMD       = :
 
 CHECK_PACKAGES = YES
 
+# We want to install DPH when validating, so that we can test it
+InstallExtraPackages = 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
@@ -33,17 +36,54 @@ ifeq "$(ValidateHpc)" "YES"
 GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
 endif
 ifeq "$(ValidateSlow)" "YES"
-GhcStage2HcOpts += -XGenerics -DDEBUG
-GhcLibHcOpts    += -XGenerics
+GhcStage2HcOpts += -DDEBUG
 endif
 
+######################################################################
+# Disable some warnings in packages we use
+
+# Temporarily turn off incomplete-pattern warnings for containers
+libraries/containers_dist-install_EXTRA_HC_OPTS += -fno-warn-incomplete-patterns
+
+# bytestring has identities at the moment
+libraries/bytestring_dist-install_EXTRA_HC_OPTS += -fno-warn-identities
+
 # 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/time_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports -fno-warn-identities
 
+# haskeline has warnings about deprecated use of block/unblock
+libraries/haskeline_dist-install_EXTRA_HC_OPTS += -fno-warn-deprecations
 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
+libraries/binary_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports -fno-warn-identities
+
+# Temporarily turn off -Werror for some Hoopl modules that have
+# non-exhaustive pattern-match warnings
+libraries/hoopl/src/Compiler/Hoopl/Util_HC_OPTS += -Wwarn
+libraries/hoopl/src/Compiler/Hoopl/GraphUtil_HC_OPTS += -Wwarn
+libraries/hoopl/src/Compiler/Hoopl/MkGraph_HC_OPTS += -Wwarn
+libraries/hoopl/src/Compiler/Hoopl/XUtil_HC_OPTS += -Wwarn
+libraries/hoopl/src/Compiler/Hoopl/Pointed_HC_OPTS += -Wwarn
+libraries/hoopl/src/Compiler/Hoopl/Passes/Dominator_HC_OPTS += -Wwarn
+
+# primitive has a warning about deprecated use of GHC.IOBase
+libraries/primitive_dist-install_EXTRA_HC_OPTS += -Wwarn
+
+# vector has some unused match warnings
+libraries/vector_dist-install_EXTRA_HC_OPTS += -Wwarn
+
+libraries/dph/dph-base_dist-install_EXTRA_HC_OPTS += -Wwarn
+libraries/dph/dph-prim-interface_dist-install_EXTRA_HC_OPTS += -Wwarn
+libraries/dph/dph-prim-seq_dist-install_EXTRA_HC_OPTS += -Wwarn
+libraries/dph/dph-prim-par_dist-install_EXTRA_HC_OPTS += -Wwarn
+libraries/dph/dph-seq_dist-install_EXTRA_HC_OPTS += -Wwarn
+libraries/dph/dph-par_dist-install_EXTRA_HC_OPTS += -Wwarn
+
+# We need -fno-warn-deprecated-flags to avoid failure with -Werror
+GhcLibHcOpts += -fno-warn-deprecated-flags
+GhcBootLibHcOpts += -fno-warn-deprecated-flags
+