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

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 673e542..8038501 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -18,7 +18,7 @@ GhcLibHcOpts    += -O -dcore-lint
 GhcLibWays     := $(filter v dyn,$(GhcLibWays))
 SplitObjs       = NO
 NoFibWays       =
-STRIP           = :
+STRIP_CMD       = :
 
 CHECK_PACKAGES = YES
 
@@ -37,13 +37,30 @@ GhcStage2HcOpts += -XGenerics -DDEBUG
 GhcLibHcOpts    += -XGenerics
 endif
 
+######################################################################
+# Disable some warnings in packages we use
+
 # 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
+
+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
+