X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=c000f852a5289c60b0c4a2a33f133a5f74c801b6;hb=52cba3c47b25a78402e542ff63dc905fc5b26b62;hp=e52a7cc086e677eba91b36097c91d000afbb59f2;hpb=25a6230431a4da86ee2fe1f6dacd0ea672207a24;p=ghc-hetmet.git

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index e52a7cc..c000f85 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -22,6 +22,9 @@ 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
@@ -40,10 +43,16 @@ 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
@@ -51,10 +60,22 @@ 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
-# binary has unusable UNPACK pragmas
-libraries/binary_dist-boot_EXTRA_HC_OPTS += -Wwarn
-libraries/binary_dist-install_EXTRA_HC_OPTS += -Wwarn
+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
@@ -63,3 +84,7 @@ 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
+