Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6942b112082fbcdff5c66f06f56fdd336861da47 >--------------------------------------------------------------- commit 6942b112082fbcdff5c66f06f56fdd336861da47 Author: Ian Lynagh <[email protected]> Date: Wed Jul 27 15:00:21 2011 +0100 Don't fail validate due to warnings in Cabal Duncan says that Cabal isn't guaranteed to be warning-free. >--------------------------------------------------------------- mk/validate-settings.mk | 5 +++++ utils/ghc-cabal/ghc.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 9f06417..f4c5162 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -54,6 +54,11 @@ endif ###################################################################### # Disable some warnings in packages we use +# Cabal doesn't promise to be warning-free +utils/ghc-cabal_dist_EXTRA_HC_OPTS += -w +libraries/Cabal/cabal_dist-boot_EXTRA_HC_OPTS += -w +libraries/Cabal/cabal_dist-install_EXTRA_HC_OPTS += -w + # Temporarily turn off incomplete-pattern warnings for containers libraries/containers_dist-install_EXTRA_HC_OPTS += -fno-warn-incomplete-patterns diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index bb28a3a..39a26f0 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -34,7 +34,8 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs | $ -hidir bootstrapping \ -ilibraries/Cabal/cabal \ -ilibraries/filepath \ - -ilibraries/hpc + -ilibraries/hpc \ + $(utils/ghc-cabal_dist_EXTRA_HC_OPTS) touch $@ # touch is required, because otherwise if mkdirhier is newer, we _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
