X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=75419e0f8f2f0490aae5f38dd86b6519aab42b64;hb=a3be88fd60cc63b97ec8509f46a8d93025760792;hp=0d21dcfc73e9a22ab5af5acb7670e60bd2b999b7;hpb=17bd9ff74ab9d5c4ff545d7cec3a6d014590f822;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index 0d21dcf..75419e0 100644 --- a/ghc.mk +++ b/ghc.mk @@ -155,7 +155,7 @@ include rules/clean-target.mk # ----------------------------------------------------------------------------- # The inplace tree -$(eval $(call clean-target,inplace,,inplace)) +$(eval $(call clean-target,inplace,,inplace/bin inplace/lib)) # ----------------------------------------------------------------------------- # Whether to build dependencies or not @@ -282,6 +282,115 @@ include rules/bindist.mk "$(MKDIRHIER)" $@ # ----------------------------------------------------------------------------- +# Phase handling + +phase_0_or_later = YES +ifeq "$(findstring $(phase),0)" "" +phase_0_done = YES +phase_1_or_later = YES +endif +ifeq "$(findstring $(phase),0 1)" "" +phase_1_done = YES +phase_2_or_later = YES +endif +ifeq "$(findstring $(phase),0 1 2)" "" +phase_2_done = YES +phase_3_or_later = YES +endif +ifeq "$(findstring $(phase),0 1 2 3)" "" +phase_3_done = YES +phase_4_or_later = YES +endif +ifeq "$(findstring $(phase),0 1 2 3 4)" "" +phase_4_done = YES +endif + +includes_dist-derivedconstants_CONFIGURE_PHASE = 0 +includes_dist-ghcconstants_CONFIGURE_PHASE = 0 + +# We do these first, as making the sources for some later +# packages needs them, and we need the sources before we can +# work out dependencies +utils/hsc2hs_dist_CONFIGURE_PHASE = 0 +utils/unlit_dist_CONFIGURE_PHASE = 0 +utils/genprimopcode_dist_CONFIGURE_PHASE = 0 + +# Then the bootlibs +libraries/hpc_dist-boot_CONFIGURE_PHASE = 1 +libraries/extensible-exceptions_dist-boot_CONFIGURE_PHASE = 1 +libraries/Cabal_dist-boot_CONFIGURE_PHASE = 1 +libraries/binary_dist-boot_CONFIGURE_PHASE = 1 +libraries/bin-package-db_dist-boot_CONFIGURE_PHASE = 1 + +# We put the stage 1 compiler package in a later phase than the bootlibs +# for the same reasone we have the +# $(compiler_stage1_depfile_haskell) : $(BOOT_LIBS) +# dependency below +compiler_stage1_CONFIGURE_PHASE = 2 + +# Now we make the stage 1 compiler binary. Again, in a later phase than +# its package for the same reason as the +# $(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB) +# dep below +ghc_stage1_CONFIGURE_PHASE = 3 + +# Finally, the stage1 compiler is used to make the dependencies for +# everything else, so we can now build the rest. +compiler_stage2_CONFIGURE_PHASE = 4 +ghc_stage2_CONFIGURE_PHASE = 4 + +libraries/ghc-prim_dist-install_CONFIGURE_PHASE = 4 +libraries/integer-gmp_dist-install_CONFIGURE_PHASE = 4 +libraries/base_dist-install_CONFIGURE_PHASE = 4 +libraries/filepath_dist-install_CONFIGURE_PHASE = 4 +libraries/array_dist-install_CONFIGURE_PHASE = 4 +libraries/bytestring_dist-install_CONFIGURE_PHASE = 4 +libraries/containers_dist-install_CONFIGURE_PHASE = 4 +libraries/unix_dist-install_CONFIGURE_PHASE = 4 +libraries/old-locale_dist-install_CONFIGURE_PHASE = 4 +libraries/old-time_dist-install_CONFIGURE_PHASE = 4 +libraries/time_dist-install_CONFIGURE_PHASE = 4 +libraries/directory_dist-install_CONFIGURE_PHASE = 4 +libraries/process_dist-install_CONFIGURE_PHASE = 4 +libraries/extensible-exceptions_dist-install_CONFIGURE_PHASE = 4 +libraries/hpc_dist-install_CONFIGURE_PHASE = 4 +libraries/pretty_dist-install_CONFIGURE_PHASE = 4 +libraries/template-haskell_dist-install_CONFIGURE_PHASE = 4 +libraries/Cabal_dist-install_CONFIGURE_PHASE = 4 +libraries/binary_dist-install_CONFIGURE_PHASE = 4 +libraries/bin-package-db_dist-install_CONFIGURE_PHASE = 4 +libraries/mtl_dist-install_CONFIGURE_PHASE = 4 +libraries/utf8-string_dist-install_CONFIGURE_PHASE = 4 +libraries/xhtml_dist-install_CONFIGURE_PHASE = 4 +libraries/terminfo_dist-install_CONFIGURE_PHASE = 4 +libraries/haskeline_dist-install_CONFIGURE_PHASE = 4 +libraries/random_dist-install_CONFIGURE_PHASE = 4 +libraries/haskell98_dist-install_CONFIGURE_PHASE = 4 +libraries/haskell2010_dist-install_CONFIGURE_PHASE = 4 +libraries/primitive_dist-install_CONFIGURE_PHASE = 4 +libraries/vector_dist-install_CONFIGURE_PHASE = 4 +libraries/dph/dph-base_dist-install_CONFIGURE_PHASE = 4 +libraries/dph/dph-prim-interface_dist-install_CONFIGURE_PHASE = 4 +libraries/dph/dph-prim-seq_dist-install_CONFIGURE_PHASE = 4 +libraries/dph/dph-prim-par_dist-install_CONFIGURE_PHASE = 4 +libraries/dph/dph-seq_dist-install_CONFIGURE_PHASE = 4 +libraries/dph/dph-par_dist-install_CONFIGURE_PHASE = 4 + +utils/hp2ps_dist_CONFIGURE_PHASE = 4 +utils/genapply_dist_CONFIGURE_PHASE = 4 +utils/haddock_dist_CONFIGURE_PHASE = 4 +utils/hsc2hs_dist-install_CONFIGURE_PHASE = 4 +utils/ghc-pkg_dist-install_CONFIGURE_PHASE = 4 +utils/hpc_dist_CONFIGURE_PHASE = 4 +utils/runghc_dist_CONFIGURE_PHASE = 4 +utils/ghctags_dist_CONFIGURE_PHASE = 4 +utils/ghc-pwd_dist_CONFIGURE_PHASE = 4 +utils/ghc-cabal_dist-install_CONFIGURE_PHASE = 4 +utils/mkUserGuidePart_dist_CONFIGURE_PHASE = 4 +utils/compare_sizes_dist_CONFIGURE_PHASE = 4 + + +# ----------------------------------------------------------------------------- # Packages # -------------------------------- @@ -299,7 +408,7 @@ DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \ # Packages that, if present, must be built by the stage2 compiler, # because they use TH and/or annotations, or depend on other stage2 # packages: -STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 +STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 random # Packages that we shouldn't build if we don't have TH (e.g. because # we're building a profiled compiler): TH_PACKAGES := $(DPH_PACKAGES) @@ -435,6 +544,8 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # package-data.mk is sufficient, as that in turn depends on all the # libraries utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk +utils/ghc-pwd/dist/package-data.mk: compiler/stage2/package-data.mk +utils/ghc-cabal/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk @@ -508,9 +619,11 @@ endif # ---------------------------------------------- # Checking packages with 'cabal check' +ifeq "$(phase)" "" ifeq "$(CHECK_PACKAGES)" "YES" all: check_packages endif +endif # These packages don't pass the Cabal checks because hs-source-dirs # points outside the source directory. This isn't a real problem in @@ -549,7 +662,7 @@ CHECKED_compiler = YES # So this is the final ordering: # Phase 0 : all package-data.mk files -# (requires ghc-cabal, ghc-pkg, mkdirhier, dummy-ghc etc.) +# (requires ghc-cabal, ghc-pkg, mkdirhier etc.) # Phase 1 : .depend files for bootstrap libs # (requires hsc2hs) # Phase 2 : compiler/stage1/.depend @@ -594,14 +707,9 @@ BUILD_DIRS += \ ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ bindisttest \ - $(GHC_CABAL_DIR) \ $(GHC_GENAPPLY_DIR) endif -BUILD_DIRS += \ - utils/haddock \ - utils/haddock/doc - ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES)) @@ -612,11 +720,15 @@ BUILD_DIRS += libraries/integer-gmp/gmp endif BUILD_DIRS += \ + utils/haddock \ + utils/haddock/doc \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ utils/testremove \ utils/ghctags \ + utils/ghc-pwd \ + $(GHC_CABAL_DIR) \ utils/hpc \ utils/runghc \ ghc @@ -663,7 +775,9 @@ utils/runghc_dist_DISABLE = YES utils/ghctags_dist_DISABLE = YES utils/hpc_dist_DISABLE = YES utils/hsc2hs_dist-install_DISABLE = YES +utils/ghc-cabal_dist-install_DISABLE = YES utils/ghc-pkg_dist-install_DISABLE = YES +utils/ghc-pwd_dist_DISABLE = YES utils/mkUserGuidePart_dist_DISABLE = YES utils/compare_sizes_dist_DISABLE = YES compiler_stage2_DISABLE = YES @@ -706,9 +820,11 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO)) # Build the Haddock contents and index ifeq "$(HADDOCK_DOCS)" "YES" -libraries/index.html: $(ALL_HADDOCK_FILES) +libraries/index.html: inplace/bin/haddock $(ALL_HADDOCK_FILES) cd libraries && sh gen_contents_index --inplace +ifeq "$(phase)" "" $(eval $(call all-target,library_doc_index,libraries/index.html)) +endif INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js CLEAN_FILES += libraries/doc-index* libraries/haddock*.css \ libraries/haddock*.js libraries/index*.html libraries/*.gif @@ -832,26 +948,26 @@ install: install_docs endif install_bins: $(INSTALL_BINS) - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" + $(call INSTALL_DIR,"$(DESTDIR)$(bindir)") for i in $(INSTALL_BINS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ; \ + $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(bindir)") ; \ done install_libs: $(INSTALL_LIBS) - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghclibdir)") for i in $(INSTALL_LIBS); do \ case $$i in \ *.a) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ + $(call INSTALL_DATA,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)"); \ $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *.dll) \ - $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ + $(call INSTALL_DATA,-s $(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)") ;; \ *.so) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ + $(call INSTALL_SHLIB,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)") ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \ + $(call INSTALL_SHLIB,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)");; \ *) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ + $(call INSTALL_DATA,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)"); \ esac; \ done @@ -859,9 +975,9 @@ install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" "" @: else - $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghclibexecdir)") for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ + $(call INSTALL_SCRIPT,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibexecdir)"); \ done endif @@ -869,9 +985,9 @@ install_libexecs: $(INSTALL_LIBEXECS) ifeq "$(INSTALL_LIBEXECS)" "" @: else - $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghclibexecdir)") for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ + $(call 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. @@ -879,38 +995,38 @@ else endif install_topdirs: $(INSTALL_TOPDIRS) - $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(topdir)") for i in $(INSTALL_TOPDIRS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \ + $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(topdir)"); \ done install_headers: $(INSTALL_HEADERS) - $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)") for i in $(INSTALL_HEADERS); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \ + $(call INSTALL_HEADER,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghcheaderdir)"); \ done install_docs: $(INSTALL_DOCS) - $(INSTALL_DIR) "$(DESTDIR)$(docdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)") ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)"; \ + $(call 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" + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html") + $(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html") ifneq "$(INSTALL_LIBRARY_DOCS)" "" - $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/libraries" + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries") for i in $(INSTALL_LIBRARY_DOCS); do \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \ + $(call 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/" + $(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/") + $(call 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`"; \ + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/`basename $$i`"); \ + $(call INSTALL_DOC,$(INSTALL_OPTS),$$i/*,"$(DESTDIR)$(docdir)/html/`basename $$i`"); \ done endif @@ -944,9 +1060,9 @@ INSTALL_DISTDIR_compiler = stage2 # Now we can do the installation install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(topdir)") "$(RM)" $(RM_OPTS_REC) "$(INSTALLED_PACKAGE_CONF)" - $(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)" + $(call 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_PKG_DIRS), \ @@ -984,8 +1100,8 @@ $(eval $(call bindist,.,\ Makefile \ mk/config.mk.in \ $(INPLACE_BIN)/mkdirhier \ - $(INPLACE_BIN)/ghc-cabal \ - utils/ghc-pwd/ghc-pwd \ + utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \ + utils/ghc-pwd/dist/build/tmp/ghc-pwd \ $(BINDIST_WRAPPERS) \ $(BINDIST_PERL_SOURCES) \ $(BINDIST_LIBS) \ @@ -1037,6 +1153,7 @@ unix-binary-dist-prep: echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) + echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(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 @@ -1076,9 +1193,15 @@ ifeq "$(mingw32_TARGET_OS)" "1" $(call try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) endif +ifeq "$(mingw32_TARGET_OS)" "1" +DOCDIR_TO_PUBLISH = bindisttest/"install dir"/doc +else +DOCDIR_TO_PUBLISH = bindisttest/"install dir"/share/doc/ghc +endif + .PHONY: publish-docs publish-docs: - $(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) + $(call try10Times,$(PublishCp) -r $(DOCDIR_TO_PUBLISH)/* $(PublishLocation)/docs) # ----------------------------------------------------------------------------- # Source distributions @@ -1103,7 +1226,7 @@ publish-docs: # Directory in which we're going to build the src dist # SRC_DIST_NAME=ghc-$(ProjectVersion) -SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) +SRC_DIST_DIR=$(TOP)/$(SRC_DIST_NAME) # # Files to include in source distributions @@ -1193,10 +1316,6 @@ sdist_%: .PHONY: clean -CLEAN_FILES += utils/ghc-pwd/ghc-pwd -CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe -CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi -CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o CLEAN_FILES += libraries/bootstrapping.conf CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants @@ -1250,6 +1369,8 @@ distclean : clean "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h + "$(RM)" $(RM_OPTS_REC) utils/ghc-pwd/dist + "$(RM)" $(RM_OPTS_REC) inplace "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2)) "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2))