X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=6643151861322e4cbc1a162297cca2f10f3f0a59;hp=c4c09f75c90297abff8c756bd98077f75a8c66a3;hb=e3971de1fe67e414060047c09c4d5c64c7083981;hpb=d96e492a22b731d72ad3e80cae2e2a773f044d7c

diff --git a/Makefile b/Makefile
index c4c09f7..6643151 100644
--- a/Makefile
+++ b/Makefile
@@ -251,6 +251,21 @@ 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.
+# We need to do the same for utilities used during library package installation.
+binary-dist::
+	$(MAKE) -C utils clean
+	$(MAKE) -C utils UseStage1=YES boot
+	$(MAKE) -C utils UseStage1=YES
+	$(RM) -f libraries/ifBuildable/ifBuildable
+	$(MAKE) -C libraries UseStage1=YES ifBuildable/ifBuildable
+	$(RM) -f libraries/installPackage/installPackage
+	$(MAKE) -C libraries UseStage1=YES installPackage/installPackage
+
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::
@@ -258,7 +273,7 @@ binary-dist::
 	$(MAKE) prefix=$(BIN_DIST_DIR) install-docs
 
 binary-dist::
-	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+	cd $(BIN_DIST_DIR) && $(SHELL) ../distrib/prep-bin-dist-mingw
 
 binary-dist::
 	$(MKDIRHIER) $(BIN_DIST_DIR)/icons
@@ -370,21 +385,21 @@ endif
 
 # Upload the distribution and documentation
 ifneq "$(PublishLocation)" ""
-publish :: publish-binary-dist
+publish ::
+	make publish-binary-dist 'prefix=$(BIN_DIST_INST_DIR)'
 endif
 
+nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
+
 .PHONY: publish-binary-dist
 publish-binary-dist ::
-	@for f in $(PUBLISH_FILES); do \
-	    for i in 0 1 2 3 4 5 6 7 8 9; do \
-	        echo "Try $$i: $(PublishCp) $$f $(PublishLocation)/dist"; \
-	        if $(PublishCp) $$f $(PublishLocation)/dist; then break; fi; \
-	    done \
+	@for f in $(PUBLISH_FILES); \
+	    do $(call nTimes,10,$(PublishCp) $$f $(PublishLocation)/dist); \
 	done
 
-# You need to first make binddisttest, and then run
-#     make publish 'prefix=$(BIN_DIST_INST_DIR)'
-# for this to find the right place.
+# You need to "make binddisttest" before publishing the docs, as it
+# works by publish setting $(prefix) to inside the binddisttest
+# directory so $(docdir) points to the right place.
 
 # We assume that Windows means Cygwin, as we can't just use docdir
 # unchanged or rsync (really SSH?) thinks that c:/foo means /foo on
@@ -397,7 +412,7 @@ PUBLISH_DOCDIR = $(docdir)
 endif
 
 publish-binary-dist ::
-	$(PublishCp) -r $(PUBLISH_DOCDIR)/* $(PublishLocation)/docs
+	$(call nTimes,10,$(PublishCp) -r "$(PUBLISH_DOCDIR)"/* $(PublishLocation)/docs)
 
 binary-dist::
 	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"