X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=f770d221406c107e4873da979406f26da5f17afc;hp=f34540553d3c35affb48bbef8f1a5dc56b61b8cc;hb=661c97c65e5fa47177502e592bb763f752b487ac;hpb=81e1bfd2cc1999b70018dc955033b2206fe93e3e diff --git a/ghc.mk b/ghc.mk index f345405..f770d22 100644 --- a/ghc.mk +++ b/ghc.mk @@ -83,7 +83,7 @@ # We need second expansion for the way we handle directories, so that # | $$$$(dir $$$$@)/. -# expands to the directoy of a rule that uses a % pattern. +# expands to the directory of a rule that uses a % pattern. .SECONDEXPANSION: default : all @@ -269,6 +269,7 @@ include rules/build-perl.mk include rules/build-package.mk include rules/build-package-way.mk include rules/haddock.mk +include rules/tags-package.mk # ----------------------------------------------------------------------------- # Registering hand-written package descriptions (used in libffi and rts) @@ -339,6 +340,8 @@ $(eval $(call addPackage,terminfo,($$(Windows),NO))) $(eval $(call addPackage,haskeline)) +$(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg)))) + ifneq "$(BootingFromHc)" "YES" PACKAGES_STAGE2 += \ dph/dph-base \ @@ -360,31 +363,36 @@ ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn endif BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB)) -OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o +OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o ifeq "$(BuildSharedLibs)" "YES" -OTHER_LIBS += libffi/libHSffi$(dyn_libsuf) +OTHER_LIBS += libffi/dist-install/build/libHSffi$(dyn_libsuf) endif # We cannot run ghc-cabal to configure a package until we have # configured and registered all of its dependencies. So the following -# hack forces all the configure steps to happen in exactly the order -# given in the PACKAGES variable above. Ideally we should use the -# correct dependencies here to allow more parallelism, but we don't -# know the dependencies until we've generated the pacakge-data.mk -# files. +# hack forces all the configure steps to happen in exactly the following order: +# +# $(PACKAGES) ghc(stage2) $(PACKAGES_STAGE2) +# +# Ideally we should use the correct dependencies here to allow more +# parallelism, but we don't know the dependencies until we've +# generated the pacakge-data.mk files. define fixed_pkg_dep -libraries/$1/$2/package-data.mk : $$(GHC_PKG_INPLACE) $$(if $$(fixed_pkg_prev),libraries/$$(fixed_pkg_prev)/$2/package-data.mk) -fixed_pkg_prev:=$1 +libraries/$1/$2/package-data.mk : $$(GHC_PKG_INPLACE) $$(fixed_pkg_prev) +fixed_pkg_prev:=libraries/$1/$2/package-data.mk endef ifneq "$(BINDIST)" "YES" fixed_pkg_prev= -$(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) +$(foreach pkg,$(PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) + +# the GHC package doesn't live in libraries/, so we add its dependency manually: +compiler/stage2/package-data.mk: $(fixed_pkg_prev) +fixed_pkg_prev:=compiler/stage2/package-data.mk + +# and continue with PACKAGES_STAGE2, which depend on GHC: +$(foreach pkg,$(PACKAGES_STAGE2),$(eval $(call fixed_pkg_dep,$(pkg),dist-install))) -# We assume that the stage2 compiler depends on all the libraries, so -# they all get added to the package database before we try to configure -# it -compiler/stage2/package-data.mk: $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),libraries/$(pkg)/dist-install/package-data.mk) ghc/stage1/package-data.mk: compiler/stage1/package-data.mk ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # haddock depends on ghc and some libraries, but depending on GHC's @@ -393,6 +401,7 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk +utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk # add the final two package.conf dependencies: ghc-prim depends on RTS, # and RTS depends on libffi. @@ -406,7 +415,11 @@ endif # Don't try to delete directories: .PRECIOUS: %/. -%/. : $(MKDIRHIER) +# Create build directories on demand. NB. the | below: this indicates +# that $(MKDIRHIER) is an order-only dependency, which means that this +# rule fires after building mkdirhier, but we won't try to recreate +# directories if mkdirhier changes. +%/. : | $(MKDIRHIER) "$(MKDIRHIER)" $@ # ----------------------------------------------------------------------------- @@ -432,9 +445,8 @@ PRIMOPS_TXT = $(GHC_COMPILER_DIR)/prelude/primops.txt libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) | $$(dir $$@)/. "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers <$(PRIMOPS_TXT) >$@ -libraries/ghc-prim/GHC/Prim.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - "$(GENPRIMOP_INPLACE)" --make-haskell-source <$(PRIMOPS_TXT) >$@ - +# Required so that Haddock documents the primops. +libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs # ----------------------------------------------------------------------------- # Include build instructions from all subdirs @@ -477,12 +489,13 @@ BUILD_DIRS = ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ - $(GHC_MKDEPENDC_DIR) \ $(GHC_MKDIRHIER_DIR) endif BUILD_DIRS += \ docs/users_guide \ + docs/ext-core \ + docs/man \ libraries/Cabal/doc \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) @@ -520,12 +533,13 @@ endif ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ - $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) + $(patsubst %, libraries/%, $(PACKAGES)) +endif + ifneq "$(BootingFromHc)" "YES" BUILD_DIRS += \ libraries/dph endif -endif ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp @@ -535,6 +549,7 @@ BUILD_DIRS += \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ + utils/ghctags \ utils/hpc \ utils/runghc \ ghc @@ -543,6 +558,15 @@ BUILD_DIRS += \ $(GHC_TOUCHY_DIR) endif +BUILD_DIRS += utils/count_lines +BUILD_DIRS += utils/compare_sizes + +ifneq "$(CLEANING)" "YES" +# After compiler/, because these packages depend on it +BUILD_DIRS += \ + $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) +endif + # XXX libraries/% must come before any programs built with stage1, see # Note [lib-depends]. @@ -576,9 +600,11 @@ ifneq "$(findstring $(phase),0 1 2 3)" "" # In phases 0-3, we disable stage2-3, the full libraries and haddock utils/haddock_dist_DISABLE = YES utils/runghc_dist_DISABLE = YES +utils/ghctags_dist_DISABLE = YES utils/hpc_dist_DISABLE = YES utils/hsc2hs_dist-install_DISABLE = YES utils/ghc-pkg_dist-install_DISABLE = YES +utils/compare_sizes_dist_DISABLE = YES compiler_stage2_DISABLE = YES compiler_stage3_DISABLE = YES ghc_stage2_DISABLE = YES @@ -599,9 +625,7 @@ include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) # We need -fno-warn-deprecated-flags to avoid failure with -Werror GhcLibHcOpts += -fno-warn-deprecated-flags -ifeq "$(ghc_ge_609)" "YES" GhcBootLibHcOpts += -fno-warn-deprecated-flags -endif # Add $(GhcLibHcOpts) to all library builds $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) @@ -665,8 +689,8 @@ compiler/stage1/package-data.mk : \ # These are necessary because the bootstrapping compiler may not know # about cross-package dependencies: -$(compiler_stage1_depfile) : $(BOOT_LIBS) -$(ghc_stage1_depfile) : $(compiler_stage1_v_LIB) +$(compiler_stage1_depfile_haskell) : $(BOOT_LIBS) +$(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB) # A few careful dependencies between bootstrapping packages. When we # can rely on the stage 0 compiler being able to generate @@ -679,6 +703,15 @@ libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binar $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) +# Make sure we have all the GHCi libs by the time we've built +# ghc-stage2. DPH includes a bit of Template Haskell which needs the +# GHCI libs, and we don't have a better way to express that dependency. +# +GHCI_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_GHCI_LIB)) \ + $(compiler_stage2_GHCI_LIB) + +ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS) + endif # ----------------------------------------------------------------------------- @@ -686,31 +719,23 @@ endif ifeq "$(Windows)" "YES" -# directories don't work well as dependencies, hence a stamp file -$(INPLACE)/stamp-mingw : $(MKDIRHIER) - $(MKDIRHIER) $(INPLACE_MINGW)/bin - GCC=`type -p $(WhatGccIsCalled)`; \ - GccDir=`dirname $$GCC`; \ - "$(CP)" -p $$GccDir/{gcc.exe,ar.exe,as.exe,dlltool.exe,dllwrap.exe,windres.exe} $(INPLACE_MINGW)/bin; \ - "$(CP)" -Rp $$GccDir/../include $(INPLACE_MINGW); \ - "$(CP)" -Rp $$GccDir/../lib $(INPLACE_MINGW); \ - "$(CP)" -Rp $$GccDir/../libexec $(INPLACE_MINGW); \ - "$(CP)" -Rp $$GccDir/../mingw32 $(INPLACE_MINGW) - touch $(INPLACE)/stamp-mingw - install : install_mingw .PHONY: install_mingw install_mingw : $(INPLACE_MINGW) "$(CP)" -Rp $(INPLACE_MINGW) $(prefix) -$(INPLACE_LIB)/perl.exe $(INPLACE_LIB)/perl56.dll : - "$(CP)" $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB) +install : install_perl +.PHONY: install_perl +install_perl : $(INPLACE_PERL) + "$(CP)" -Rp $(INPLACE_PERL) $(prefix) endif # Windows -libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \ +ifneq "$(BINDIST)" "YES" +$(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs \ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs +endif # BINDIST libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ @@ -722,38 +747,40 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ | $$(dir $$@)/. "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@ +.PHONY: tags +tags: tags_compiler + +.PHONY: TAGS +TAGS: TAGS_compiler + # ----------------------------------------------------------------------------- # Installation install: install_packages install_libs install_libexecs install_headers \ install_libexec_scripts install_bins install_docs \ - install_topdirs install_topdir_scripts + install_topdirs install_bins: $(INSTALL_BINS) - $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" for i in $(INSTALL_BINS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir) ; \ - if test "$(darwin_TARGET_OS)" = "1"; then \ - sh mk/fix_install_names.sh $(ghclibdir) $(DESTDIR)$(bindir)/$$i ; \ - fi ; \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ; \ done install_libs: $(INSTALL_LIBS) - $(INSTALL_DIR) $(DESTDIR)$(ghclibdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" for i in $(INSTALL_LIBS); do \ case $$i in \ *.a) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *.dll) \ - $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \ + $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ *.so) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ - install_name_tool -id $(DESTDIR)$(ghclibdir)/`basename $$i` $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \ *) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ esac; \ done @@ -761,9 +788,9 @@ install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" "" @: else - $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ done endif @@ -771,48 +798,48 @@ install_libexecs: $(INSTALL_LIBEXECS) ifeq "$(INSTALL_LIBEXECS)" "" @: else - $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ done +# We rename ghc-stage2, so that the right program name is used in error +# messages etc. + "$(MV)" "$(DESTDIR)$(ghclibexecdir)/ghc-stage2" "$(DESTDIR)$(ghclibexecdir)/ghc" endif -install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS) - $(INSTALL_DIR) $(DESTDIR)$(topdir) - for i in $(INSTALL_TOPDIR_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \ - done - install_topdirs: $(INSTALL_TOPDIRS) - $(INSTALL_DIR) $(DESTDIR)$(topdir) + $(INSTALL_DIR) "$(DESTDIR)$(topdir)" for i in $(INSTALL_TOPDIRS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(topdir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \ done install_headers: $(INSTALL_HEADERS) - $(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)" for i in $(INSTALL_HEADERS); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghcheaderdir); \ + $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \ done -install_docs: $(INSTALL_HEADERS) - $(INSTALL_DIR) $(DESTDIR)$(docdir) +install_docs: $(INSTALL_DOCS) + $(INSTALL_DIR) "$(DESTDIR)$(docdir)" ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)"; \ done endif - $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html - $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html + $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html" + $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html" ifneq "$(INSTALL_LIBRARY_DOCS)" "" + $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/libraries" for i in $(INSTALL_LIBRARY_DOCS); do \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \ done + $(INSTALL_DATA) $(INSTALL_OPTS) libraries/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/" + $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/" endif ifneq "$(INSTALL_HTML_DOC_DIRS)" "" for i in $(INSTALL_HTML_DOC_DIRS); do \ - $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \ + $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* "$(DESTDIR)$(docdir)/html/`basename $$i`"; \ done endif @@ -821,41 +848,54 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d # Install packages in the right order, so that ghc-pkg doesn't complain. # Also, install ghc-pkg first. ifeq "$(Windows)" "NO" -INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-stage2 +INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg else INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif -INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES)) +INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES)) +ifeq "$(InstallExtraPackages)" "NO" +INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) +endif + HIDDEN_PACKAGES = binary +define set_INSTALL_DISTDIR +# $1 = libraries/base, $2 = dist-install +# => +# INSTALL_DISTDIR_libraries/base = dist-install +INSTALL_DISTDIR_$1 = $2 +endef + +$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\ +$(call set_INSTALL_DISTDIR,libraries/$p,dist-install))) +INSTALL_DISTDIR_compiler = stage2 + +ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \ + compiler \ + $(addprefix libraries/,$(PACKAGES_STAGE2)) + install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - $(INSTALL_DIR) $(DESTDIR)$(topdir) - "$(RM)" -r $(RM_OPTS) $(INSTALLED_PACKAGE_CONF) - $(INSTALL_DIR) $(INSTALLED_PACKAGE_CONF) - "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install - "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install - $(foreach p, $(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\ + $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + "$(RM)" -r $(RM_OPTS) "$(INSTALLED_PACKAGE_CONF)" + $(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)" + "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install + "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install + $(foreach p, $(ALL_INSTALLED_PACKAGES),\ "$(GHC_CABAL_INPLACE)" install \ - $(INSTALLED_GHC_REAL) \ - $(INSTALLED_GHC_PKG_REAL) \ - $(DESTDIR)$(topdir) \ - libraries/$p dist-install \ + "$(INSTALLED_GHC_REAL)" \ + "$(INSTALLED_GHC_PKG_REAL)" \ + "$(STRIP)" \ + "$(DESTDIR)$(topdir)" \ + $p $(INSTALL_DISTDIR_$p) \ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \ $(RelocatableBuild) &&) true $(foreach p, $(HIDDEN_PACKAGES),\ - $(INSTALLED_GHC_PKG_REAL) --global-conf $(INSTALLED_PACKAGE_CONF) \ + "$(INSTALLED_GHC_PKG_REAL)" --global-conf "$(INSTALLED_PACKAGE_CONF)" \ hide $p &&) true - "$(GHC_CABAL_INPLACE)" install \ - $(INSTALLED_GHC_REAL) \ - $(INSTALLED_GHC_PKG_REAL) \ - $(DESTDIR)$(topdir) \ - compiler stage2 \ - '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \ - $(RelocatableBuild) # ----------------------------------------------------------------------------- # Binary distributions @@ -866,6 +906,8 @@ ifneq "$(CLEANING)" "YES" $(eval $(call bindist,.,\ LICENSE \ + README \ + INSTALL \ configure config.sub config.guess install-sh \ extra-gcc-opts.in \ Makefile \ @@ -874,6 +916,7 @@ $(eval $(call bindist,.,\ $(INPLACE_BIN)/ghc-cabal \ utils/ghc-pwd/ghc-pwd \ $(BINDIST_WRAPPERS) \ + $(BINDIST_PERL_SOURCES) \ $(BINDIST_LIBS) \ $(BINDIST_HI) \ $(BINDIST_EXTRAS) \ @@ -886,19 +929,22 @@ $(eval $(call bindist,.,\ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ $(INSTALL_TOPDIRS) \ - $(INSTALL_TOPDIR_SCRIPTS) \ $(INSTALL_BINS) \ + $(INSTALL_MANPAGES) \ $(INSTALL_DOCS) \ $(INSTALL_LIBRARY_DOCS) \ $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ docs/index.html \ + compiler/stage2/doc \ $(wildcard libraries/*/dist-install/doc/) \ + $(wildcard libraries/*/*/dist-install/doc/) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \ - mk/fix_install_names.sh \ mk/project.mk \ mk/install.mk.in \ bindist.mk \ + libraries/gen_contents_index \ + libraries/prologue.txt \ libraries/dph/LICENSE \ )) endif @@ -910,13 +956,13 @@ BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk unix-binary-dist-prep: "$(RM)" $(RM_OPTS) -r bindistprep/ "$(MKDIRHIER)" $(BIN_DIST_PREP_DIR) - set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done + set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK) echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) - ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac + echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) cd $(BIN_DIST_PREP_DIR) && autoreconf "$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR) # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source @@ -935,18 +981,30 @@ else "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss endif -nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done +# tryTimes tries to run its third argument multiple times, until it +# succeeds. Don't call it directly; call try10Times instead. +# The first and second argument to tryTimes are lists of values. +# The length of the first argument is the number of times we have +# already tried. The length of the second argument is the number more +# times we will try. +tryTimes = $(if $2, \ + { echo 'Try $(words x $1): $3' ; $3 ; } || \ + $(call tryTimes,x $1,$(wordlist 2,$(words $2),$2),$3), \ + ) + +# Try to run the argument 10 times. If all 10 fail, fail. +try10Times = $(call tryTimes,,x x x x x x x x x x,$1) { echo Failed; false; } .PHONY: publish-binary-dist publish-binary-dist: - $(call nTimes,10,$(PublishCp) $(BIN_DIST_TAR_BZ2) $(PublishLocation)/dist) + $(call try10Times,$(PublishCp) $(BIN_DIST_TAR_BZ2) $(PublishLocation)/dist) ifeq "$(mingw32_TARGET_OS)" "1" - $(call nTimes,10,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) + $(call try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) endif .PHONY: publish-docs publish-docs: - $(call nTimes,10,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) + $(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) # ----------------------------------------------------------------------------- # Source distributions @@ -976,7 +1034,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries +SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries ghc-tarballs SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \ @@ -1017,10 +1075,10 @@ sdist-prep : $(call sdist_file,utils/hpc,dist,,,HpcParser,y) $(call sdist_file,utils/genprimopcode,dist,,,Lexer,x) $(call sdist_file,utils/genprimopcode,dist,,,Parser,y) - $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Lex,x) - $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Parse,y) + $(call sdist_file,utils/haddock,dist,src,Haddock,Lex,x) + $(call sdist_file,utils/haddock,dist,src,Haddock,Parse,y) cd $(SRC_DIST_DIR) && "$(RM)" $(RM_OPTS) -r compiler/stage[123] mk/build.mk - cd $(SRC_DIST_DIR) && "$(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" -o -name "*-darcs-backup*" \) -print | xargs "$(RM)" $(RM_OPTS) -r + cd $(SRC_DIST_DIR) && "$(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" -o -name "*-darcs-backup*" \) -print | "$(XARGS)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS) -r .PHONY: sdist sdist : sdist-prep @@ -1034,14 +1092,29 @@ sdist-manifest : $(SRC_DIST_TARBALL) # over SSH. ifneq "$(PublishLocation)" "" publish-sdist : - $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) + $(call try10Times,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) endif ifeq "$(BootingFromHc)" "YES" -SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt) +# In a normal build we use GHC to compile C files (see +# rules/c-suffix-rules.mk), which passes a number of its own options +# to the C compiler. So when bootstrapping we have to provide these +# flags explicitly to C compilations. +SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER +SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) +SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) endif # ----------------------------------------------------------------------------- +# sdisting libraries + +# Use manually, with e.g.: +# make sdist_directory + +sdist_%: + inplace/bin/ghc-cabal sdist libraries/$* dist-install + +# ----------------------------------------------------------------------------- # Cleaning .PHONY: clean