ifeq "$(BootingFromHc)" "YES"
SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
else
-SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts libraries/Cabal/doc
endif
SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
INSTALL_STAGE =
endif
+install-strip:
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+
# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
install :: check-packages
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-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::
$(MAKE) prefix=$(BIN_DIST_DIR) install
+ $(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
$(MAKE) -C gmp binary-dist DOING_BIN_DIST=YES
$(MAKE) -C includes binary-dist DOING_BIN_DIST=YES
$(MAKE) -C compiler binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
- # Setting _way here is a nasty hack to make sure we get
- # libHSrts*.a etc rather than just libHSrts.a
- $(MAKE) -C rts binary-dist DOING_BIN_DIST=YES _way='*'
+ $(MAKE) -C rts binary-dist DOING_BIN_DIST=YES
$(MAKE) -C driver binary-dist DOING_BIN_DIST=YES
$(MAKE) -C utils binary-dist DOING_BIN_DIST=YES
$(MAKE) -C docs binary-dist DOING_BIN_DIST=YES
echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE)
echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE)
echo "XMLDocWays = $(XMLDocWays)" >> $(VARFILE)
+ # We won't actually use xsltproc, but we need to know if it's "" or not
+ echo "XSLTPROC = $(XSLTPROC)" >> $(VARFILE)
echo "TARGETPLATFORM = $(TARGETPLATFORM)" >> $(VARFILE)
echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(VARFILE)
# 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
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!"
&& for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \
&& for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
&& $(MAKE) distclean \
- && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; fi \
+ && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \
&& $(RM) -rf compiler/stage[123] mk/build.mk \
&& $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \
)
projects / ghc-hetmet.git / blobdiff