X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=41e09dd60765e17433ae2064aebd1a76285dff6a;hb=6effb9e6c8af3a5b600824d90f0e8e6a44ab18ae;hp=c4c09f75c90297abff8c756bd98077f75a8c66a3;hpb=d96e492a22b731d72ad3e80cae2e2a773f044d7c;p=ghc-hetmet.git

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::