X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=fe5e8452c623fbd32632f9902707c6c4653f60ec;hp=cc5e527e51234ce57f29c79b61a07181bfd37596;hb=HEAD;hpb=e95140a5c350360b1f8e3f1e789ec4a5eebf95f3 diff --git a/ghc.mk b/ghc.mk index cc5e527..fe5e845 100644 --- a/ghc.mk +++ b/ghc.mk @@ -1,3 +1,4 @@ + # ----------------------------------------------------------------------------- # # (c) 2009 The University of Glasgow @@ -12,12 +13,6 @@ # ToDo List. # -# * finish installation -# * Windows: should we have ghc-pkg-? -# * should we be stripping things? -# * install libgmp.a, gmp.h -# * need to fix Cabal for new Windows layout, see -# Distribution/Simple/GHC.configureToolchain. # * remove old Makefiles, add new stubs for building in subdirs # * docs/Makefile # * docs/docbook-cheat-sheet/Makefile @@ -27,13 +22,8 @@ # * docs/vh/Makefile # * rts/dotnet/Makefile # * utils/Makefile -# * optionally install stage3? # * add Makefiles for the rest of the utils/ programs that aren't built # by default (need to exclude them from 'make all' too) -# -# Tickets we can now close, or fix and close: -# -# * 1693 make distclean # Possible cleanups: # @@ -43,7 +33,7 @@ # then we don't have to use -osuf/-hisuf. We would have to install # them in different places too, so we'd need ghc-pkg support for packages # of different ways. -# * make PACKAGES generated by configure or sh boot? +# * make PACKAGES generated by './configure' or './boot'? # * we should use a directory of package.conf files rather than a single # file for the inplace package database, so that we can express # dependencies more accurately. Otherwise it's possible to get into @@ -96,10 +86,9 @@ else $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?) endif -# Just bring makefiles up to date: -.PHONY: just-makefiles -just-makefiles: - @: +ifneq "$(CLEANING)" "YES" +CLEANING = NO +endif # ----------------------------------------------------------------------------- # Misc GNU make utils @@ -115,7 +104,8 @@ comma=, .SUFFIXES: # ----------------------------------------------------------------------------- -# Makefile debugging +# Makefile debugging +# # to see the effective value used for a Makefile variable, do # make show VALUE=MY_VALUE # @@ -146,6 +136,17 @@ $(error $$(GhcLibWays) is empty, it must contain at least one way) endif endif +ifeq "$(phase)" "" +phase = final +endif + +# ----------------------------------------------------------------------------- +# Utility definitions + +include rules/prof.mk +include rules/trace.mk +include rules/make-command.mk + # ----------------------------------------------------------------------------- # Macros for standard targets @@ -155,7 +156,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 @@ -176,14 +177,6 @@ NO_INCLUDE_DEPS = YES # We want package-data.mk for show endif -# We don't haddock the bootstrapping libraries -libraries/hpc_dist-boot_DO_HADDOCK = NO -libraries/Cabal_dist-boot_DO_HADDOCK = NO -libraries/extensible-exceptions_dist-boot_DO_HADDOCK = NO -libraries/filepath_dist-boot_DO_HADDOCK = NO -libraries/binary_dist-boot_DO_HADDOCK = NO -libraries/bin-package-db_dist-boot_DO_HADDOCK = NO - # ----------------------------------------------------------------------------- # Ways @@ -216,26 +209,15 @@ ifneq "$(CLEANING)" "YES" include rules/hs-suffix-rules-srcdir.mk include rules/hs-suffix-rules.mk - -# ----------------------------------------------------------------------------- -# Suffix rules for .hi files - include rules/hi-rule.mk $(foreach way,$(ALL_WAYS),\ $(eval $(call hi-rule,$(way)))) -#----------------------------------------------------------------------------- -# C-related suffix rules - include rules/c-suffix-rules.mk - -#----------------------------------------------------------------------------- -# CMM-related suffix rules - include rules/cmm-suffix-rules.mk -endif +endif # CLEANING=YES # ----------------------------------------------------------------------------- # Building package-data.mk files from .cabal files @@ -245,7 +227,9 @@ include rules/package-config.mk # ----------------------------------------------------------------------------- # Building dependencies +include rules/dependencies.mk include rules/build-dependencies.mk +include rules/include-dependencies.mk # ----------------------------------------------------------------------------- # Build package-data.mk files @@ -270,6 +254,7 @@ include rules/build-package.mk include rules/build-package-way.mk include rules/haddock.mk include rules/tags-package.mk +include rules/extra-packages.mk # ----------------------------------------------------------------------------- # Registering hand-written package descriptions (used in libffi and rts) @@ -287,22 +272,99 @@ include rules/docbook.mk include rules/bindist.mk # ----------------------------------------------------------------------------- -# Building libraries +# Directories -define addPackage # args: $1 = package, $2 = condition - ifneq "$2" "" +# Don't try to delete directories: +.PRECIOUS: %/. + +# 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)" $@ + +# ----------------------------------------------------------------------------- +# Packages + +# -------------------------------- +# Properties of packages +# These lists say "if this package is built, here's a property it has" +# They do not say "this package will be built"; see $(PACKAGES_xx) for that + +# Packages that are built but not installed +INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml + +DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \ + dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \ + vector primitive + +# 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 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) + +# Packages that are built by stage0, in addition to stage1. These +# packages are dependencies of GHC, that we do not assume the stage0 +# compiler already has installed (or up-to-date enough). +# +# We assume that the stage0 compiler has a suitable bytestring package, +# so we don't have to include it below. +STAGE0_PACKAGES = Cabal hpc extensible-exceptions binary bin-package-db hoopl + +# These packages are installed, but are installed hidden +# Why install them at all? Because the 'ghc' package depends on them +HIDDEN_PACKAGES = binary + +# $(EXTRA_PACKAGES) is another classification, of packages built but +# not installed +# It is set in rules/extra-package.mk, +# by $(call extra-packages) a little further down +# this ghc.mk + + +# -------------------------------- +# Packages to build +# The lists of packages that we *actually* going to build in each stage: +# +# $(STAGE0_PACKAGE) does double duty; it really is the list of packages +# we build the bootstrap compiler in stage 0 +# +# $(PACKAGES) A list of directories relative to libraries/ containing +# packages that will be built by stage1, in dependency +# order. +# +# $(PACKAGES_STAGE2) Ditto, for stage2. +# + +define addPackageGeneral +# args: $1 = PACKAGES variable, $2 = package, $3 = condition + ifeq "$3" "" + $1 += $2 + else ifeq "$$(CLEANING)" "YES" - PACKAGES += $1 + $1 += $2 else - ifeq $2 - PACKAGES += $1 + ifeq $3 + $1 += $2 endif endif - else - PACKAGES += $1 endif endef +define addPackage # args: $1 = package, $2 = condition +ifneq "$(filter $1,$(TH_PACKAGES)) $(GhcProfiled)" "$1 YES" +ifeq "$(filter $1,$(STAGE2_PACKAGES))" "$1" +$(call addPackageGeneral,PACKAGES_STAGE2,$1,$2) +else +$(call addPackageGeneral,PACKAGES,$1,$2) +endif +endif +endef + $(eval $(call addPackage,ghc-prim)) ifeq "$(CLEANING)" "YES" $(eval $(call addPackage,integer-gmp)) @@ -327,46 +389,24 @@ $(eval $(call addPackage,process)) $(eval $(call addPackage,random)) $(eval $(call addPackage,extensible-exceptions)) $(eval $(call addPackage,haskell98)) +$(eval $(call addPackage,haskell2010)) $(eval $(call addPackage,hpc)) $(eval $(call addPackage,pretty)) $(eval $(call addPackage,template-haskell)) $(eval $(call addPackage,Cabal)) $(eval $(call addPackage,binary)) $(eval $(call addPackage,bin-package-db)) +$(eval $(call addPackage,hoopl)) $(eval $(call addPackage,mtl)) $(eval $(call addPackage,utf8-string)) - +$(eval $(call addPackage,xhtml)) $(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 \ - dph/dph-prim-interface \ - dph/dph-prim-seq \ - dph/dph-prim-par \ - dph/dph-seq \ - dph/dph-par -endif - -# We assume that the stage0 compiler has a suitable bytestring package, -# so we don't have to include it below. -BOOT_PKGS = Cabal hpc extensible-exceptions binary bin-package-db - -# The actual .a and .so/.dll files: needed for dependencies. -ALL_STAGE1_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB)) -ifeq "$(BuildSharedLibs)" "YES" -ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB)) -endif -BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB)) +$(eval $(call extra-packages)) -OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o -ifeq "$(BuildSharedLibs)" "YES" -OTHER_LIBS += libffi/dist-install/build/libHSffi$(dyn_libsuf) -endif +# ------------------------------------------- +# Dependencies between package-data.mk files # We cannot run ghc-cabal to configure a package until we have # configured and registered all of its dependencies. So the following @@ -399,9 +439,13 @@ 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-install/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 -utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk +utils/compare_sizes/dist-install/package-data.mk: compiler/stage2/package-data.mk +utils/runghc/dist-install/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. @@ -409,20 +453,24 @@ libraries/ghc-prim/dist-install/package-data.mk : rts/package.conf.inplace rts/package.conf.inplace : libffi/package.conf.inplace endif -# ----------------------------------------------------------------------------- -# Directories +# -------------------------------- +# Misc package-related settings -# Don't try to delete directories: -.PRECIOUS: %/. +BOOT_PKG_CONSTRAINTS := $(foreach p,$(STAGE0_PACKAGES),--constraint "$p == $(shell grep -i "^Version:" libraries/$p/$p.cabal | sed "s/[^0-9.]//g")") -# 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)" $@ +# The actual .a and .so/.dll files: needed for dependencies. +ALL_STAGE1_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB)) +ifeq "$(BuildSharedLibs)" "YES" +ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB)) +endif +BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB)) -# ----------------------------------------------------------------------------- +OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o +ifeq "$(BuildSharedLibs)" "YES" +OTHER_LIBS += libffi/dist-install/build/libHSffi$(dyn_libsuf) +endif + +# ---------------------------------------- # Special magic for the ghc-prim package # We want the ghc-prim package to include the GHC.Prim module when it @@ -448,44 +496,40 @@ libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLAC # 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 +# ---------------------------------------- +# Special magic for the integer package + +ifneq "$(CLEANING)" "YES" +ifeq "$(INTEGER_LIBRARY)" "integer-gmp" +libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple +else ifeq "$(INTEGER_LIBRARY)" "integer-simple" +libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple +else +$(error Unknown integer library: $(INTEGER_LIBRARY)) +endif +endif -# For the rationale behind the build phases, see -# http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture/Idiom/PhaseOrdering +# ---------------------------------------------- +# Checking packages with 'cabal check' -# Setting foo_dist_DISABLE=YES means "in directory foo, for build -# "dist", just read the package-data.mk file, do not build anything". +ifeq "$(phase)" "final" +ifeq "$(CHECK_PACKAGES)" "YES" +all: check_packages +endif +endif -# We carefully engineer things so that we can build the -# package-data.mk files early on: they depend only on a few tools also -# built early. Having got the package-data.mk files built, we can -# restart make with up-to-date information about all the packages -# (this is phase 0). The remaining problem is the .depend files: -# -# - .depend files in libraries need the stage 1 compiler to build -# - ghc/stage1/.depend needs compiler/stage1 built -# - compiler/stage1/.depend needs the bootstrap libs built -# -# GHC 6.11+ can build a .depend file without having built the -# dependencies of the package, but we can't rely on the bootstrapping -# compiler being able to do this, which is why we have to separate the -# three phases above. - -# So this is the final ordering: - -# Phase 0 : all package-data.mk files -# (requires ghc-cabal, ghc-pkg, mkdirhier, dummy-ghc etc.) -# Phase 1 : .depend files for bootstrap libs -# (requires hsc2hs) -# Phase 2 : compiler/stage1/.depend -# (requires bootstrap libs and genprimopcode) -# Phase 3 : ghc/stage1/.depend -# (requires compiler/stage1) -# -# The rest : libraries/*/dist-install, compiler/stage2, ghc/stage2 +# These packages don't pass the Cabal checks because hs-source-dirs +# points outside the source directory. This isn't a real problem in +# these cases, so we just skip checking them. +# NB. these must come before we include the ghc.mk files below, because +# they disable the relevant rules. +CHECKED_libraries/dph/dph-seq = YES +CHECKED_libraries/dph/dph-par = YES +# In compiler's case, include-dirs points outside of the source tree +CHECKED_compiler = YES -BUILD_DIRS = +# ----------------------------------------------------------------------------- +# Include build instructions from all subdirs ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ @@ -496,13 +540,11 @@ BUILD_DIRS += \ docs/users_guide \ docs/ext-core \ docs/man \ - libraries/Cabal/doc \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) ifneq "$(GhcUnregisterised)" "YES" BUILD_DIRS += \ - $(GHC_MANGLER_DIR) \ $(GHC_SPLIT_DIR) endif @@ -515,41 +557,38 @@ BUILD_DIRS += \ driver \ driver/ghci \ driver/ghc \ + driver/haddock \ libffi \ includes \ rts ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ - $(GHC_CABAL_DIR) \ + bindisttest \ $(GHC_GENAPPLY_DIR) endif -ifneq "$(HADDOCK_DOCS)" "NO" -BUILD_DIRS += \ - utils/haddock \ - utils/haddock/doc -endif - ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES)) endif -ifneq "$(BootingFromHc)" "YES" -BUILD_DIRS += \ - libraries/dph -endif - ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp +else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" +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 @@ -558,6 +597,11 @@ BUILD_DIRS += \ $(GHC_TOUCHY_DIR) endif +ifneq "$(BINDIST)" "YES" +BUILD_DIRS += \ + utils/mkUserGuidePart +endif + BUILD_DIRS += utils/count_lines BUILD_DIRS += utils/compare_sizes @@ -567,91 +611,51 @@ BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) endif -# XXX libraries/% must come before any programs built with stage1, see -# Note [lib-depends]. - -ifeq "$(phase)" "0" -$(foreach lib,$(BOOT_PKGS),$(eval \ - libraries/$(lib)_dist-boot_DISABLE = YES)) -endif - -ifneq "$(findstring $(phase),0 1)" "" -# We can build deps for compiler/stage1 in phase 2 -compiler_stage1_DISABLE = YES -endif - -ifneq "$(findstring $(phase),0 1 2)" "" -ghc_stage1_DISABLE = YES -endif - -ifneq "$(CLEANING)" "YES" -ifeq "$(INTEGER_LIBRARY)" "integer-gmp" -libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple -else - ifeq "$(INTEGER_LIBRARY)" "integer-simple" - libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple - else -$(error Unknown integer library: $(INTEGER_LIBRARY)) - endif -endif -endif - -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 -ghc_stage3_DISABLE = YES -$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ - libraries/$(lib)_dist-install_DISABLE = YES)) -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 -# these cases, so we just skip checking them. -CHECKED_libraries/dph/dph-seq = YES -CHECKED_libraries/dph/dph-par = YES -# In compiler's case, include-dirs points outside of the source tree -CHECKED_compiler = YES +# ---------------------------------------------- +# Actually include all the sub-ghc.mk's 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 +# A useful pseudo-target (must be after the include above, because it needs +# the value of things like $(libraries/base_dist-install_v_LIB). +.PHONY: stage1_libs +stage1_libs : $(ALL_STAGE1_LIBS) -# Add $(GhcLibHcOpts) to all library builds +# ---------------------------------------------- +# Per-package compiler flags +# +# If you want to add per-package compiler flags, this +# is the place to do it. Do it like this for package +# +# libraries/_dist-boot_HC_OPTS += -Wwarn +# libraries/_dist-install_HC_OPTS += -Wwarn + +# Add $(GhcLibHcOpts) to all package builds $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) -# XXX Hack; remove this -$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn)) +# Add $(GhcBootLibHcOpts) to all stage0 package builds +$(foreach pkg,$(STAGE0_PACKAGES),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) -# A useful pseudo-target -.PHONY: stage1_libs -stage1_libs : $(ALL_STAGE1_LIBS) +# ----------------------------------------------- +# Haddock-related bits +# Don't run Haddock for the package that will not be installed +$(foreach p,$(INTREE_ONLY_PACKAGES),$(eval libraries/$p_dist-install_DO_HADDOCK = NO)) +# We don't haddock the bootstrapping libraries +$(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$(exeext) $(ALL_HADDOCK_FILES) cd libraries && sh gen_contents_index --inplace +ifeq "$(phase)" "final" $(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 endif -ifeq "$(CHECK_PACKAGES)" "YES" -all: check_packages -endif - # ----------------------------------------------------------------------------- # Bootstrapping libraries @@ -676,34 +680,15 @@ $(eval $(call build-package,libraries/extensible-exceptions,dist-boot,0)) $(eval $(call build-package,libraries/Cabal,dist-boot,0)) $(eval $(call build-package,libraries/binary,dist-boot,0)) $(eval $(call build-package,libraries/bin-package-db,dist-boot,0)) +$(eval $(call build-package,libraries/hoopl,dist-boot,0)) # register the boot packages in strict sequence, because running # multiple ghc-pkgs in parallel doesn't work (registrations may get # lost). fixed_pkg_prev= -$(foreach pkg,$(BOOT_PKGS),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot))) - -compiler/stage1/package-data.mk : \ - libraries/Cabal/dist-boot/package-data.mk \ - libraries/hpc/dist-boot/package-data.mk \ - libraries/extensible-exceptions/dist-boot/package-data.mk \ - libraries/bin-package-db/dist-boot/package-data.mk - -# These are necessary because the bootstrapping compiler may not know -# about cross-package dependencies: -$(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 -# cross-package dependencies with -M (fixed in GHC 6.12.1) we can drop -# these, and also some of the phases. -# -# If you miss any out here, then 'make -j8' will probably tell you. -# -libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf) libraries/Cabal/dist-boot/build/Distribution/InstalledPackageInfo.$(v_hisuf) +$(foreach pkg,$(STAGE0_PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot))) -$(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) +compiler/stage1/package-data.mk : $(fixed_pkg_prev) # 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 @@ -712,8 +697,21 @@ $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBo GHCI_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_GHCI_LIB)) \ $(compiler_stage2_GHCI_LIB) +ifeq "$(UseArchivesForGhci)" "NO" ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS) +endif + +ifeq "$(UseArchivesForGhci)" "YES" +GHCI_lib_way = v +else +GHCI_lib_way = GHCI +endif +# Deps for TH uses in libraries +$(foreach way, $(GhcLibWays),$(eval \ +libraries/vector/dist-install/build/Data/Vector/Fusion/Stream/Monadic.$($(way)_osuf): \ + $(libraries/primitive_dist-install_$(GHCI_lib_way)_LIB) \ + )) endif # ----------------------------------------------------------------------------- @@ -735,8 +733,7 @@ endif # Windows 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 + libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs endif # BINDIST libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ @@ -744,11 +741,6 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ | $$(dir $$@)/. "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@ -libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ - $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ - | $$(dir $$@)/. - "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@ - .PHONY: tags tags: tags_compiler @@ -758,31 +750,33 @@ 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: install_libs install_packages install_libexecs install_headers \ + install_libexec_scripts install_bins install_topdirs +ifeq "$(HADDOCK_DOCS)" "YES" +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 @@ -790,9 +784,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 @@ -800,54 +794,48 @@ 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. "$(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)" + $(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 @@ -863,43 +851,46 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif -INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES)) -HIDDEN_PACKAGES = binary - -define set_INSTALL_DISTDIR -# $1 = libraries/base, $2 = dist-install -# => -# INSTALL_DISTDIR_libraries/base = dist-install -INSTALL_DISTDIR_$1 = $2 -endef +INSTALLED_PKG_DIRS := $(addprefix libraries/,$(PACKAGES)) \ + compiler \ + $(addprefix libraries/,$(PACKAGES_STAGE2)) +ifeq "$(InstallExtraPackages)" "NO" +INSTALLED_PKG_DIRS := $(filter-out $(addprefix libraries/,$(EXTRA_PACKAGES)),\ + $(INSTALLED_PKG_DIRS)) +endif +INSTALLED_PKG_DIRS := $(filter-out $(addprefix libraries/,$(INTREE_ONLY_PACKAGES)),\ + $(INSTALLED_PKG_DIRS)) -$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\ -$(call set_INSTALL_DISTDIR,libraries/$p,dist-install))) +# Set the INSTALL_DISTDIR_p for each package; compiler is special +$(foreach p,$(filter-out compiler,$(INSTALLED_PKG_DIRS)),\ + $(eval INSTALL_DISTDIR_$p = dist-install)) INSTALL_DISTDIR_compiler = stage2 -ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \ - compiler \ - $(addprefix libraries/,$(PACKAGES_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)" - "$(RM)" -r $(RM_OPTS) "$(INSTALLED_PACKAGE_CONF)" - $(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)" + $(call INSTALL_DIR,"$(DESTDIR)$(topdir)") + "$(RM)" $(RM_OPTS_REC) "$(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, $(ALL_INSTALLED_PACKAGES),\ - "$(GHC_CABAL_INPLACE)" 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)" \ - hide $p &&) true + $(foreach p, $(INSTALLED_PKG_DIRS), \ + $(call make-command, \ + "$(GHC_CABAL_INPLACE)" install \ + "$(INSTALLED_GHC_REAL)" \ + "$(INSTALLED_GHC_PKG_REAL)" \ + "$(STRIP_CMD)" \ + "$(DESTDIR)$(topdir)" \ + $p $(INSTALL_DISTDIR_$p) \ + '$(DESTDIR)' \ + '$(prefix)' \ + '$(ghclibdir)' \ + '$(docdir)/html/libraries' \ + $(RelocatableBuild))) + $(foreach p, $(HIDDEN_PACKAGES), \ + $(call make-command, \ + "$(INSTALLED_GHC_PKG_REAL)" \ + --global-conf "$(INSTALLED_PACKAGE_CONF)" hide $p)) # ----------------------------------------------------------------------------- # Binary distributions @@ -913,42 +904,46 @@ $(eval $(call bindist,.,\ README \ INSTALL \ configure config.sub config.guess install-sh \ - extra-gcc-opts.in \ + settings.in \ + packages \ Makefile \ mk/config.mk.in \ $(INPLACE_BIN)/mkdirhier \ - $(INPLACE_BIN)/ghc-cabal \ - utils/ghc-pwd/ghc-pwd \ - $(BINDIST_WRAPPERS) \ - $(BINDIST_LIBS) \ - $(BINDIST_HI) \ - $(BINDIST_EXTRAS) \ - $(includes_H_CONFIG) \ - $(includes_H_PLATFORM) \ + utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \ + utils/ghc-pwd/dist-install/build/tmp/ghc-pwd \ + $(BINDIST_WRAPPERS) \ + $(BINDIST_PERL_SOURCES) \ + $(BINDIST_LIBS) \ + $(BINDIST_HI) \ + $(BINDIST_EXTRAS) \ + $(includes_H_CONFIG) \ + $(includes_H_PLATFORM) \ $(includes_H_FILES) \ - includes/ghcconfig.h \ - includes/rts/Config.h \ + includes/ghcconfig.h \ $(INSTALL_HEADERS) \ $(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/) \ - $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ + docs/index.html \ + compiler/stage2/doc \ + $(wildcard libraries/*/dist-install/doc/) \ + $(wildcard libraries/*/*/dist-install/doc/) \ + $(filter-out settings,$(INSTALL_LIBS)) \ $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \ - mk/project.mk \ - mk/install.mk.in \ - bindist.mk \ - libraries/gen_contents_index \ - libraries/prologue.txt \ - libraries/dph/LICENSE \ + mk/project.mk \ + mk/install.mk.in \ + bindist.mk \ + libraries/gen_contents_index \ + libraries/prologue.txt \ + $(wildcard libraries/dph/LICENSE \ + libraries/dph/ghc-packages \ + libraries/dph/ghc-packages2 \ + libraries/dph/ghc-stage2-package) \ )) endif # mk/project.mk gets an absolute path, so we manually include it in @@ -957,45 +952,64 @@ endif BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk unix-binary-dist-prep: - "$(RM)" $(RM_OPTS) -r bindistprep/ + "$(RM)" $(RM_OPTS_REC) 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 distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done + set -e; for i in packages LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh settings.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) 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 # tree then we want to include the real file, not a symlink to it - cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) + cd bindistprep && "$(TAR_CMD)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) windows-binary-dist-prep: - "$(RM)" $(RM_OPTS) -r bindistprep/ + "$(RM)" $(RM_OPTS_REC) bindistprep/ $(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install - cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) + cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) windows-installer: -ifeq "$(ISCC)" "" - @echo No ISCC, so not making installer +ifeq "$(ISCC_CMD)" "" + @echo No ISCC_CMD, so not making installer else - "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss + "$(ISCC_CMD)" /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 + +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 nTimes,10,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) + $(call try10Times,$(PublishCp) -r $(DOCDIR_TO_PUBLISH)/* $(PublishLocation)/docs) # ----------------------------------------------------------------------------- # Source distributions @@ -1020,7 +1034,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 @@ -1029,7 +1043,7 @@ SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \ - ghc.spec.in ghc.spec extra-gcc-opts.in VERSION \ + ghc.spec.in ghc.spec settings.in VERSION \ boot boot-pkgs packages ghc.mk SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2 @@ -1050,7 +1064,7 @@ endef .PHONY: sdist-prep sdist-prep : - "$(RM)" $(RM_OPTS) -r $(SRC_DIST_DIR) + "$(RM)" $(RM_OPTS_REC) $(SRC_DIST_DIR) "$(RM)" $(RM_OPTS) $(SRC_DIST_TARBALL) mkdir $(SRC_DIST_DIR) cd $(SRC_DIST_DIR) && for i in $(SRC_DIST_DIRS); do mkdir $$i; ( cd $$i && lndir $(TOP)/$$i ); done @@ -1068,12 +1082,12 @@ sdist-prep : $(call sdist_file,utils/genprimopcode,dist,,,Parser,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)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS) -r + cd $(SRC_DIST_DIR) && "$(RM)" $(RM_OPTS_REC) 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)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS_REC) .PHONY: sdist sdist : sdist-prep - "$(TAR)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL) + "$(TAR_CMD)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL) sdist-manifest : $(SRC_DIST_TARBALL) tar tjf $(SRC_DIST_TARBALL) | sed "s|^ghc-$(ProjectVersion)/||" | sort >sdist-manifest @@ -1083,7 +1097,7 @@ 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" @@ -1110,10 +1124,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 @@ -1124,23 +1134,12 @@ clean : clean_files clean_libraries clean_files : "$(RM)" $(RM_OPTS) $(CLEAN_FILES) -ifneq "$(NO_CLEAN_GMP)" "YES" -CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h -CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a - -clean : clean_gmp -.PHONY: clean_gmp -clean_gmp: - "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/objs - "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/gmpbuild -endif - .PHONY: clean_libraries clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2)) -clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(BOOT_PKGS)) +clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(STAGE0_PACKAGES)) clean_libraries: - "$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS_REC) $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2)) "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/*.buildinfo, $(PACKAGES) $(PACKAGES_STAGE2)) # We have to define a clean target for each library manually, because the @@ -1153,13 +1152,13 @@ endif clean : clean_bindistprep .PHONY: clean_bindistprep clean_bindistprep: - "$(RM)" $(RM_OPTS) -r bindistprep/ + "$(RM)" $(RM_OPTS_REC) bindistprep/ distclean : clean "$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h "$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk "$(RM)" $(RM_OPTS) mk/config.mk.old mk/project.mk.old - "$(RM)" $(RM_OPTS) extra-gcc-opts docs/users_guide/ug-book.xml + "$(RM)" $(RM_OPTS) settings docs/users_guide/ug-book.xml "$(RM)" $(RM_OPTS) compiler/ghc.cabal compiler/ghc.cabal.old "$(RM)" $(RM_OPTS) ghc/ghc-bin.cabal "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h @@ -1167,15 +1166,17 @@ 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)) "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/include/Hs*Config.h, $(PACKAGES) $(PACKAGES_STAGE2)) - "$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/autom4te.cache, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS_REC) $(patsubst %, libraries/%/autom4te.cache, $(PACKAGES) $(PACKAGES_STAGE2)) maintainer-clean : distclean "$(RM)" $(RM_OPTS) configure mk/config.h.in - "$(RM)" $(RM_OPTS) -r autom4te.cache libraries/*/autom4te.cache + "$(RM)" $(RM_OPTS_REC) autom4te.cache libraries/*/autom4te.cache "$(RM)" $(RM_OPTS) ghc.spec "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/GNUmakefile, \ $(PACKAGES) $(PACKAGES_STAGE2)) @@ -1198,3 +1199,27 @@ bootstrapping-files: includes/GHCConstants.h .DELETE_ON_ERROR: +# ----------------------------------------------------------------------------- +# Numbered phase targets + +.PHONY: phase_0_builds +phase_0_builds: $(utils/hsc2hs_dist_depfile_haskell) +phase_0_builds: $(utils/hsc2hs_dist_depfile_c_asm) +phase_0_builds: $(utils/genprimopcode_dist_depfile_haskell) +phase_0_builds: $(utils/genprimopcode_dist_depfile_c_asm) + +.PHONY: phase_1_builds +phase_1_builds: $(PACKAGE_DATA_MKS) + +# ----------------------------------------------------------------------------- +# Support for writing GHC passes in Coq + +compiler/hetmet/Makefile: + git submodule update --init compiler/hetmet + cd compiler/hetmet/; git checkout master +compiler/hetmet/build/CoqPass.hs: compiler/hetmet/Makefile $(wildcard compiler/hetmet/src/*.v) $(wildcard compiler/hetmet/src/*.hs) + cd compiler/hetmet; make build/CoqPass.hs +compiler/stage1/build/CoqPass.hs: compiler/hetmet/build/CoqPass.hs + cp compiler/hetmet/build/CoqPass.hs $@ +compiler/stage2/build/CoqPass.hs: compiler/hetmet/build/CoqPass.hs + cp compiler/hetmet/build/CoqPass.hs $@