[commit: ghc] master: Try to make ghc-pkg and ghc-cabal use the same flags when bootstrapping. (dc7549a)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/dc7549a170aa531c50f15383f39a856d2ad94d8e

>---------------------------------------------------------------

commit dc7549a170aa531c50f15383f39a856d2ad94d8e
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Feb 1 07:59:02 2013 +0000

    Try to make ghc-pkg and ghc-cabal use the same flags when bootstrapping.
    
    They share modules in Cabal, and unless they use exactly the same
    flags GHC recompiles the modules.

>---------------------------------------------------------------

 utils/ghc-cabal/ghc.mk |    3 ++-
 utils/ghc-pkg/ghc.mk   |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index de0c5f2..2b105f4 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -28,8 +28,9 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/C
 $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
 	"$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/Main.hs -o $@ \
 	       -no-user-$(GHC_PACKAGE_DB_FLAG) \
-	       -Wall \
+	       -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
+               -DBOOTSTRAPPING \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
 	       -ilibraries/Cabal/Cabal \
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 5a3761d..2a721de 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -61,7 +61,6 @@ utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
 	       -iutils/ghc-pkg \
-	       -XCPP -XExistentialQuantification -XDeriveDataTypeable \
 	       -iutils/ghc-pkg/dist/build \
 	       -ilibraries/Cabal/Cabal \
 	       -ilibraries/filepath \