X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=22c6f921c5b0be9c5902f3b6b12e02d6f2095d4a;hb=11b059fe35fe7bdcf43d4ce3246d0b9ae1671391;hp=9034773f0fd153bc2f3cf27e0a3445e081487d9a;hpb=f38871fdd92e466cbbc7eb08e226c4213bcbd7d6;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9034773..22c6f92 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -922,6 +922,7 @@ ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" ""
 # some variables appropriately:
 HC		=$(GHC_STAGE1)
 MKDEPENDHS	=$(GHC_STAGE1)
+USE_NEW_MKDEPEND_FLAGS = YES
 GhcVersion	= @ProjectVersion@
 GhcPatchLevel	= @ProjectPatchLevel@
 # oops, these are wrong:
@@ -934,8 +935,14 @@ ghc_ge_609 = YES
 
 else # not UseStage1 or BootingFromHc
 
+# Some useful GHC version predicates:
+ghc_ge_605 = @ghc_ge_605@
+ghc_ge_607 = @ghc_ge_607@
+ghc_ge_609 = @ghc_ge_609@
+
 HC	        = @WithHc@
 MKDEPENDHS	= $(GHC)
+USE_NEW_MKDEPEND_FLAGS = $(ghc_ge_609)
 GhcVersion	= @GhcVersion@
 GhcPatchLevel	= @GhcPatchLevel@
 GhcMajVersion	= @GhcMajVersion@
@@ -949,13 +956,8 @@ GhcMinVersion	= @GhcMinVersion@
 # when $(HC) does *not* point to one of the GHC binaries built in
 # the local tree.
 #
-BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring $(GHC_COMPILER_DIR_ABS), $(HC)),,-package-conf $(BOOTSTRAPPING_CONF))
-BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring $(GHC_COMPILER_DIR_ABS), $(MKDEPENDHS)),,-package-conf $(BOOTSTRAPPING_CONF))
-
-# Some useful GHC version predicates:
-ghc_ge_605 = @ghc_ge_605@
-ghc_ge_607 = @ghc_ge_607@
-ghc_ge_609 = @ghc_ge_609@
+BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring inplace, $(HC)),,-package-conf $(BOOTSTRAPPING_CONF))
+BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring inplace, $(MKDEPENDHS)),,-package-conf $(BOOTSTRAPPING_CONF))
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version