diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-09-02 22:47:26 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-09-02 22:47:26 +0000 |
| commit | 814946f35c725c22f67979642828dbefcaeaf8c3 (patch) | |
| tree | 5c069485ef25eb70f50084588f19788609cc1a53 /utils | |
| parent | f571f630505bc13b4d7e997f317078462dba8afa (diff) | |
| download | haskell-814946f35c725c22f67979642828dbefcaeaf8c3.tar.gz | |
Add some -no-user-package-conf flags
Stops user-installed packages breaking the build
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 1 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 1 |
2 files changed, 2 insertions, 0 deletions
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 \ |