Commit 814946f3 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Add some -no-user-package-conf flags

Stops user-installed packages breaking the build
parent f571f630
...@@ -1266,7 +1266,7 @@ if test ! -f utils/ghc-pwd/ghc-pwd && test ! -f utils/ghc-pwd/ghc-pwd.exe; then ...@@ -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 *.hi
rm -f ghc-pwd rm -f ghc-pwd
rm -f ghc-pwd.exe 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 ../.. cd ../..
fi fi
......
...@@ -32,6 +32,7 @@ $1_$2_HC_DEP = ...@@ -32,6 +32,7 @@ $1_$2_HC_DEP =
$1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF) $1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF)
$1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF) $1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF)
$1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF) $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
$1_$2_HC_OPTS += -no-user-package-conf
ifeq "$(ghc_ge_613)" "YES" ifeq "$(ghc_ge_613)" "YES"
$1_$2_HC_OPTS += -rtsopts $1_$2_HC_OPTS += -rtsopts
endif endif
......
...@@ -27,6 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/D ...@@ -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_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 $@ \ "$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/ghc-cabal.hs -o $@ \
-no-user-package-conf \
-Wall $(WERROR) \ -Wall $(WERROR) \
-DCABAL_VERSION=$(CABAL_VERSION) \ -DCABAL_VERSION=$(CABAL_VERSION) \
-odir bootstrapping \ -odir bootstrapping \
......
...@@ -48,6 +48,7 @@ endif ...@@ -48,6 +48,7 @@ endif
# The binary package is not warning-clean, so we need a few -fno-warns here. # 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 $$@)/. 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 $@ \ "$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
-no-user-package-conf \
-Wall -fno-warn-unused-imports \ -Wall -fno-warn-unused-imports \
-DCABAL_VERSION=$(CABAL_VERSION) \ -DCABAL_VERSION=$(CABAL_VERSION) \
-DBOOTSTRAPPING \ -DBOOTSTRAPPING \
......
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