diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2008-01-04 16:28:40 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2008-01-04 16:28:40 +0000 |
| commit | d70b588ca35138bcfa21f30eb27b2015cb954ed0 (patch) | |
| tree | 25fcfb4e5f112ae4d9aed328657823d7a168d67e /mk | |
| parent | f757a5b168fbd2f3f40056f37aa8613117e9a3da (diff) | |
| download | haskell-d70b588ca35138bcfa21f30eb27b2015cb954ed0.tar.gz | |
pass -no-user-package-conf to ghc-inplace
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 1ce9751b02..b241dc946a 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -856,9 +856,14 @@ NHC = @NHC@ # tree). We can refer to "this ghc" as $(GHC_INPLACE): GHC_INPLACE = $(GHC_COMPILER_DIR)/ghc-inplace -GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace +GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf +GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf +GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf + +# NOTE: add -no-user-package-conf for stage 1-3 above, so that +# we avoid picking up any packages the user might happen to have +# installed for this GHC version. They are bound to be incompatible +# with the packages we built in the tree. ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" "" |