From 7b45c46cbabe1288ea87bd9b94c57e010ed17e60 Mon Sep 17 00:00:00 2001
From: Simon Marlow <marlowsd@gmail.com>
Date: Fri, 15 May 2009 11:11:09 +0000
Subject: [PATCH] Further fixes to the stage1 version hack; fix validate. I'm
 less convinced this is a good idea now.  But it does avoid rebuilding most of
 stage1 when you pull and reconfigure.  Better solutions welcome.

---
 compiler/ghc.mk | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 22459b5831d7..8ecfa7df7e49 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -404,15 +404,22 @@ compiler/stage3/package-data.mk : compiler/ghc.mk
 
 compiler_PACKAGE = ghc
 
+# Note [fiddle-stage1-version]
 # The version of the GHC package changes every day, since the
 # patchlevel is the current date.  We don't want to force
 # recompilation of the entire compiler when this happens, so for stage
 # 1 we omit the patchlevel from the version number.  For stage 2 we
 # have to include the patchlevel since this is the package we install,
 # however.
+#
+# Note: we also have to tweak the version number of the package itself
+# when it gets registered; see Note [munge-stage1-package-config]
+# below.
+ifneq "$(ProjectPatchLevel)" "0"
 define compiler_PACKAGE_MAGIC
 compiler_stage1_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion))
 endef
+endif
 
 # haddocking only happens for stage2
 compiler_stage1_DO_HADDOCK = NO
@@ -450,5 +457,17 @@ $(compiler_stage3_depfile) : compiler/stage3/$(PLATFORM_H)
 $(compiler_stage1_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS)
 $(compiler_stage2_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS)
 $(compiler_stage3_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS)
+
+# Note [munge-stage1-package-config]
+# Strip the date/patchlevel from the version of stage1.  See Note
+# [fiddle-stage1-version] above.
+ifneq "$(ProjectPatchLevel)" "0"
+compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config
+	sed "s#.$(ProjectPatchLevel)##" <$< >$@
+	$(compiler_stage1_GHC_PKG) update --force $(compiler_stage1_GHC_PKG_OPTS) $@
+
+$(compiler_stage1_v_LIB) : compiler/stage1/inplace-pkg-config-munged
+endif
+
 endif
 
-- 
GitLab