binary has unused-import warnings

diff --git a/ghc.mk b/ghc.mk
index 91b5d3d..e2d721d 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -661,7 +661,7 @@ $(ghc_stage1_depfile) : $(compiler_stage1_v_LIB)
 #
 # If you miss any out here, then 'make -j8' will probably tell you.
 #
-libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf)
+libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf) libraries/Cabal/dist-boot/build/Distribution/InstalledPackageInfo.$(v_hisuf)
 
 $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts)))
 

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index b70a045..8ab5af8 100644 (file)
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -35,3 +35,6 @@ 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
 
+# 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

diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index ae15376..23953e0 100644 (file)
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -46,11 +46,12 @@ endif
 endif
 
 # depend on ghc-cabal, otherwise we build Cabal twice when building in parallel
+# The binary package is not warning-clean, so we need a few -fno-warns here.
 utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs $(GHC_CABAL_INPLACE) $(MKDIRHIER)
        "$(MKDIRHIER)" bootstrapping
        "$(MKDIRHIER)" utils/ghc-pkg/dist/build
        "$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
-              -Wall \
+              -Wall -fno-warn-unused-imports \
               -DCABAL_VERSION=$(CABAL_VERSION) \
               -odir  bootstrapping \
               -hidir bootstrapping \