From: sof <unknown>
Date: Fri, 9 Nov 2001 17:39:45 +0000 (+0000)
Subject: [project @ 2001-11-09 17:39:45 by sof]
X-Git-Tag: Approximately_9120_patches~587
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=cd844a66e94dec45c5d88d05ce50d84d56e46d07;p=ghc-hetmet.git

[project @ 2001-11-09 17:39:45 by sof]
Optimised defn of CANON_HC_VERSION, synthesise it from config.mk info,
not via an expensive $(shell ...) call.
---

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 0e29e82..011a607 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.199 2001/11/09 17:02:09 sof Exp $
+# $Id: Makefile,v 1.200 2001/11/09 17:39:45 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -109,15 +109,9 @@ SRC_HC_OPTS += -DJAVA
 endif
 
 #
-# Canonicalize the GHC version number - assume it is has the form x.yy.[z] or 
-# x.yy[.date] where date = yyyymmdd
+# Canonicalized GHC version number for easy version comparisons.
 #
-# [First sed substitution gets rid of the '.', second gets rid of the date portion,
-#  third appends a '0' if the z portion is missing]
-#
-CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)........$$/\1/g;s/^\(...\)$$/\10/g')
-
-# 20010625
+CANON_HC_VERSION=$(GhcMajVersion)$(GhcMinVersion)$(GhcPatchLevel)
 
 ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler