From 25a6230431a4da86ee2fe1f6dacd0ea672207a24 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 10 Jul 2010 16:17:23 +0000 Subject: [PATCH] Move all the warning workarounds to one place --- ghc.mk | 12 ------------ mk/validate-settings.mk | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ghc.mk b/ghc.mk index 1c41a4a..299fcb9 100644 --- a/ghc.mk +++ b/ghc.mk @@ -647,18 +647,6 @@ GhcBootLibHcOpts += -fno-warn-deprecated-flags # Add $(GhcLibHcOpts) to all library builds $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) -# XXX Hack; remove this -# Use -Wwarn for dph -$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn)) - -# XXX Hack; remove this -# Use -Wwarn for 'binary' becuase it has redundant UNPACK pragmas -libraries/binary_dist-install_HC_OPTS += -Wwarn -libraries/binary_dist-boot_HC_OPTS += -Wwarn - -# XXX hack: haskeline has warnings about deprecated use of block/unblock -libraries/haskeline_dist-install_HC_OPTS += -Wwarn - # ---------------------------------------------- # A useful pseudo-target .PHONY: stage1_libs diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 31c8853..e52a7cc 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -37,13 +37,29 @@ 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 +# binary has unusable UNPACK pragmas +libraries/binary_dist-boot_EXTRA_HC_OPTS += -Wwarn +libraries/binary_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 + -- 1.7.10.4