Commit c7ad7938 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Use the new -optdep flag replacements when building with >= GHC 6.9

Fix building the HEAD with itself
parent 704bbd54
...@@ -922,6 +922,7 @@ ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" "" ...@@ -922,6 +922,7 @@ ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" ""
# some variables appropriately: # some variables appropriately:
HC =$(GHC_STAGE1) HC =$(GHC_STAGE1)
MKDEPENDHS =$(GHC_STAGE1) MKDEPENDHS =$(GHC_STAGE1)
USE_NEW_MKDEPEND_FLAGS = YES
GhcVersion = @ProjectVersion@ GhcVersion = @ProjectVersion@
GhcPatchLevel = @ProjectPatchLevel@ GhcPatchLevel = @ProjectPatchLevel@
# oops, these are wrong: # oops, these are wrong:
...@@ -934,8 +935,14 @@ ghc_ge_609 = YES ...@@ -934,8 +935,14 @@ ghc_ge_609 = YES
else # not UseStage1 or BootingFromHc 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@ HC = @WithHc@
MKDEPENDHS = $(GHC) MKDEPENDHS = $(GHC)
USE_NEW_MKDEPEND_FLAGS = $(ghc_ge_609)
GhcVersion = @GhcVersion@ GhcVersion = @GhcVersion@
GhcPatchLevel = @GhcPatchLevel@ GhcPatchLevel = @GhcPatchLevel@
GhcMajVersion = @GhcMajVersion@ GhcMajVersion = @GhcMajVersion@
...@@ -951,11 +958,6 @@ GhcMinVersion = @GhcMinVersion@ ...@@ -951,11 +958,6 @@ GhcMinVersion = @GhcMinVersion@
# #
BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS =$(if $(findstring inplace, $(HC)),,-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)) BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS =$(if $(findstring inplace, $(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@
endif endif
# Canonicalised ghc version number, used for easy (integer) version # Canonicalised ghc version number, used for easy (integer) version
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment