Commit dc7549a1 authored by Simon Marlow's avatar Simon Marlow
Browse files

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.
parent 76eeef40
...@@ -28,8 +28,9 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/C ...@@ -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_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 $@ \ "$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/Main.hs -o $@ \
-no-user-$(GHC_PACKAGE_DB_FLAG) \ -no-user-$(GHC_PACKAGE_DB_FLAG) \
-Wall \ -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
-DCABAL_VERSION=$(CABAL_VERSION) \ -DCABAL_VERSION=$(CABAL_VERSION) \
-DBOOTSTRAPPING \
-odir bootstrapping \ -odir bootstrapping \
-hidir bootstrapping \ -hidir bootstrapping \
-ilibraries/Cabal/Cabal \ -ilibraries/Cabal/Cabal \
......
...@@ -61,7 +61,6 @@ utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/ ...@@ -61,7 +61,6 @@ utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/
-odir bootstrapping \ -odir bootstrapping \
-hidir bootstrapping \ -hidir bootstrapping \
-iutils/ghc-pkg \ -iutils/ghc-pkg \
-XCPP -XExistentialQuantification -XDeriveDataTypeable \
-iutils/ghc-pkg/dist/build \ -iutils/ghc-pkg/dist/build \
-ilibraries/Cabal/Cabal \ -ilibraries/Cabal/Cabal \
-ilibraries/filepath \ -ilibraries/filepath \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment