Commit 124690e9 authored by sof's avatar sof
Browse files

[project @ 2001-11-09 21:25:56 by sof]

GhcCanonVersion: leave out GhcPatchLevel, causes problems when
the GhcPatchLevel isn't a patchlevel but a date.
parent 914cc0f0
# -----------------------------------------------------------------------------
# $Id: Makefile,v 1.201 2001/11/09 18:17:48 sof Exp $
# $Id: Makefile,v 1.202 2001/11/09 21:25:56 sof Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
......@@ -113,9 +113,9 @@ ifeq "$(BootingFromHc)" "YES"
bootstrapped = YES
compiling_with_4xx=NO
else
bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi)
compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 5000); then echo YES; else echo NO; fi)
ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 5020); then echo YES; else echo NO; fi)
bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)); then echo YES; else echo NO; fi)
compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi)
endif
# Only include GHCi if we're bootstrapping with at least version 411
......
......@@ -26,7 +26,7 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)" \
SRC_HC_OPTS += -fglasgow-exts -cpp
ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 4070); then echo YES; else echo NO; fi)
ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 407); then echo YES; else echo NO; fi)
ifeq "$(ghc_407_at_least)" "YES"
SRC_HC_OPTS += -package concurrent -package text
......
......@@ -615,7 +615,7 @@ GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
GhcPatchLevel = @GhcPatchLevel@
# Canonicalised ghc version number, used for easy (integer) version comparisons.
GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)$(GhcPatchLevel)
GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
HBC = @HBC@
NHC = @NHC@
......
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