Commit 4c6dda01 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

HEAD now requires GHC >= 7.0 to bootstrap

parent b9a72063
......@@ -130,8 +130,6 @@ if test "$WithGhc" != ""; then
AC_SUBST(GhcPatchLevel)dnl
GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi
AC_SUBST(ghc_ge_613)dnl
BOOTSTRAPPING_GHC_INFO_FIELD([CC_STAGE0],[C compiler command],['$(CC)'])
BOOTSTRAPPING_GHC_INFO_FIELD([AR_STAGE0],[ar command],['$(AR)'])
......@@ -144,8 +142,8 @@ if test "$BootingFromHc" = "NO"; then
if test "$WithGhc" = ""; then
AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
fi
FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.12],
[AC_MSG_ERROR([GHC version 6.12 or later is required to compile GHC.])])dnl
FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.0],
[AC_MSG_ERROR([GHC version 7.0 or later is required to compile GHC.])])dnl
if test `expr $GhcMinVersion % 2` = "1"; then
if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then
......
......@@ -528,9 +528,6 @@ GhcPatchLevel = @GhcPatchLevel@
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
# Keep this in sync with the variables in package-config.mk
ghc_ge_613 = @ghc_ge_613@
# Canonicalised ghc version number, used for easy (integer) version
# comparisons. We must expand $(GhcMinVersion) to two digits by
# adding a leading zero if necessary:
......
......@@ -25,7 +25,6 @@ $1_$2_ArSupportsAtFile = $$(ArSupportsAtFile_STAGE$3)
# configuration stuff that depends on which GHC we're building with
ifeq "$3" "0"
$1_$2_ghc_ge_613 = $$(ghc_ge_613)
$1_$2_HC_CONFIG = $$(GHC_STAGE0)
$1_$2_HC_CONFIG_DEP =
$1_$2_GHC_PKG = $$(GHC_PKG)
......@@ -39,11 +38,8 @@ $1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF)
$1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF)
$1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
$1_$2_MORE_HC_OPTS += -no-user-package-conf
ifeq "$(ghc_ge_613)" "YES"
$1_$2_MORE_HC_OPTS += -rtsopts
endif
else
$1_$2_ghc_ge_613 = YES
$1_$2_HC_PKGCONF =
$1_$2_HC_CONFIG = $$(TOP)/$$(GHC_STAGE1)
$1_$2_HC_CONFIG_DEP = $$(GHC_STAGE1)
......
Markdown is supported
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