diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-13 10:46:58 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-13 10:46:58 +0000 |
| commit | 65446998cecc828631beba145560933d7d15cf8e (patch) | |
| tree | 7d4f1624d0cfa3c6294dfda930daea55b066370d /mk | |
| parent | f26ce77a29d2dd870dc8af819eec8536e67d4301 (diff) | |
| download | haskell-65446998cecc828631beba145560933d7d15cf8e.tar.gz | |
Change how we detect if we are using the bootstrapping compiler or not
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".
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 9034773f0f..068add51a8 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -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@ |