From d70b588ca35138bcfa21f30eb27b2015cb954ed0 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 4 Jan 2008 16:28:40 +0000 Subject: [PATCH] pass -no-user-package-conf to ghc-inplace --- mk/config.mk.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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))" "" -- 1.7.10.4