diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | rules/package-config.mk | 1 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 1 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index a5132f027a..d9a14343b7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1266,7 +1266,7 @@ if test ! -f utils/ghc-pwd/ghc-pwd && test ! -f utils/ghc-pwd/ghc-pwd.exe; then rm -f *.hi rm -f ghc-pwd rm -f ghc-pwd.exe - "$WithGhc" -v0 --make ghc-pwd -o ghc-pwd + "$WithGhc" -v0 -no-user-package-conf --make ghc-pwd -o ghc-pwd cd ../.. fi diff --git a/rules/package-config.mk b/rules/package-config.mk index c30f11724e..b68f2e1de5 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -32,6 +32,7 @@ $1_$2_HC_DEP = $1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF) $1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF) $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF) +$1_$2_HC_OPTS += -no-user-package-conf ifeq "$(ghc_ge_613)" "YES" $1_$2_HC_OPTS += -rtsopts endif diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index f495048d22..448dd463e6 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -27,6 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/D $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/ghc-cabal.hs | $$(dir $$@)/. bootstrapping/. "$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/ghc-cabal.hs -o $@ \ + -no-user-package-conf \ -Wall $(WERROR) \ -DCABAL_VERSION=$(CABAL_VERSION) \ -odir bootstrapping \ diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index e9fe119ad4..67ca1555ab 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -48,6 +48,7 @@ endif # 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) | bootstrapping/. $$(dir $$@)/. "$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \ + -no-user-package-conf \ -Wall -fno-warn-unused-imports \ -DCABAL_VERSION=$(CABAL_VERSION) \ -DBOOTSTRAPPING \ |