X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=b45884752e323e613af8fd3cea4499cbf4b0470b;hb=64557b454b1a184ef9ee177806a05b75c79c0eb6;hp=31c8853fdc24535c89fa6eb9f11742e5cbce48f3;hpb=0481fe092fd9e274096fff1fd9885fd68805202a;p=ghc-hetmet.git

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 31c8853..b458847 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
@@ -37,13 +40,39 @@ GhcStage2HcOpts += -XGenerics -DDEBUG
 GhcLibHcOpts    += -XGenerics
 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
+
 # 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
 
+# 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
+
+# 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
+