diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2013-02-01 07:59:02 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2013-02-01 08:58:23 +0000 |
| commit | dc7549a170aa531c50f15383f39a856d2ad94d8e (patch) | |
| tree | 488b452851ce6c44e27c85dcd9b5b9da794ed363 /utils | |
| parent | 76eeef402018393b2c60f4eafdbde2c8a792fb34 (diff) | |
| download | haskell-dc7549a170aa531c50f15383f39a856d2ad94d8e.tar.gz | |
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.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 3 | ||||
| -rw-r--r-- | 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 de0c5f21ae..2b105f424c 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 5a3761d527..2a721dedad 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 \ |