From: Ian Lynagh <igloo@earth.li>
Date: Tue, 27 Nov 2007 20:39:59 +0000 (+0000)
Subject: Rebuild utils with the stage1 compiler when making a bindist; fixes trac #1860
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=4b0ccf514d57a2e183173eab4a26ed2f6359afa4

Rebuild utils with the stage1 compiler when making a bindist; fixes trac #1860
This is a bit unpleasant, as "make binary-dist" really shouldn't actually
build anything, but it works.
---

diff --git a/Makefile b/Makefile
index c4c09f7..41e09dd 100644
--- a/Makefile
+++ b/Makefile
@@ -251,6 +251,16 @@ binary-dist::
 	-rm -rf $(BIN_DIST_DIR)
 	-$(RM) $(BIN_DIST_DIR).tar.gz
 
+# When making bindists, we can have problems if some things (e.g. ghc-pkg)
+# are compiled with the bootstrapping compiler and some (e.g. the stage 2
+# compiler) with the stage1 compiler. See #1860 for an example.
+# Thus we rebuild the utils with stage 1 here. This is a bit unpleasant,
+# as binary-dist really shouldn't actually build anything, but it works.
+binary-dist::
+	$(MAKE) -C utils clean
+	$(MAKE) -C utils UseStage1=YES boot
+	$(MAKE) -C utils UseStage1=YES
+
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::