summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2007-11-27 20:39:59 +0000
committerIan Lynagh <igloo@earth.li>2007-11-27 20:39:59 +0000
commit4b0ccf514d57a2e183173eab4a26ed2f6359afa4 (patch)
treea004811c411da9a53778c1584a9e2dc11d3e41ce /Makefile
parent5d536b42c88dbe9523c4b0c799a0e46c2d984aa6 (diff)
downloadhaskell-4b0ccf514d57a2e183173eab4a26ed2f6359afa4.tar.gz
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c4c09f75c9..41e09dd607 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::