X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fconfig.mk.in;h=b241dc946aa0efe80257ef7306a48415b81b1eac;hb=d70b588ca35138bcfa21f30eb27b2015cb954ed0;hp=1ce9751b026898a6936b3723c30731de29e3004d;hpb=88e09197fcd710148c7a6b990b9a2b4706b49881;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 1ce9751..b241dc9 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))" ""