Change how we detect if we are using the bootstrapping compiler or not
authorIan Lynagh <igloo@earth.li>
Sat, 13 Sep 2008 10:46:58 +0000 (10:46 +0000)
committerIan Lynagh <igloo@earth.li>
Sat, 13 Sep 2008 10:46:58 +0000 (10:46 +0000)
I think looking for $(GHC_COMPILER_DIR_ABS) was failing on the Windows
buildbot due to different path separators. Now we just look for
"inplace".

mk/config.mk.in

index 9034773..068add5 100644 (file)
@@ -949,8 +949,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))
+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))
 
 # Some useful GHC version predicates:
 ghc_ge_605 = @ghc_ge_605@