X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=4850720242ba4f1100d273e8f8d0764914ed7343;hp=687f72da402fcfcf995a17da9cf584adffebb5e5;hb=83d563cb9ede0ba792836e529b1e2929db926355;hpb=36091517e6b1d87b8dacd5168fcc464ac75f65bd diff --git a/ghc.mk b/ghc.mk index 687f72d..4850720 100644 --- a/ghc.mk +++ b/ghc.mk @@ -12,66 +12,27 @@ # ToDo List. # -# Before we can merge the new build system into HEAD: -# -# * finish installation -# * other documentation -# * create doc index and contents -# * Windows: should we have ghc-pkg-? -# * should we be stripping things? -# * install libgmp.a, gmp.h -# * finish binary distributions -# * need to fix Cabal for new Windows layout, see -# Distribution/Simple/GHC.configureToolchain. -# -# Once the new build system is in HEAD, and before 6.12: -# -# * separate the logic of whether to do something from the test for -# existence of the tool to do it. For example, rather than checking -# if $DIR_DOCBOOK_XSL or $XSLTPROC is "", we should have a variable -# for controlling the building of the docs. # * remove old Makefiles, add new stubs for building in subdirs -# * utils/hsc2hs/Makefile -# * utils/haddock/Makefile -# * mk/oldconfig.mk.in # * docs/Makefile # * docs/docbook-cheat-sheet/Makefile # * docs/ext-core/Makefile # * docs/man/Makefile # * docs/storage-mgmt/Makefile -# * docs/users_guide/Makefile # * docs/vh/Makefile -# * driver/Makefile -# * driver/ghc/Makefile -# * libraries/Makefile # * rts/dotnet/Makefile # * utils/Makefile -# * docbook PDFs, e.g. "dblatex -T db2latex users_guide.xml" -# * GhcProfiled -# * optionally install stage3? -# * shared libraries, way dyn -# * get HC bootstrapping working # * 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: -# -# * 2966 make sure --with-gcc does the right thing (#2966) -# * 1693 make distclean -# * 2689 make maintainer-clean -# * 3173 make install with DESTDIR # Possible cleanups: # # * per-source-file dependencies instead of one .depend file? # * eliminate undefined variables, and use --warn-undefined-variables? -# * perhaps we should make all the output dirs in the .depend rule, to -# avoid all these mkdirhier calls? # * put outputs from different ways in different subdirs of distdir/build, # 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 @@ -107,13 +68,32 @@ # o libraries/* # o compiler +.PHONY: default all haddock + +# We need second expansion for the way we handle directories, so that +# | $$$$(dir $$$$@)/. +# expands to the directory of a rule that uses a % pattern. +.SECONDEXPANSION: + default : all +# Catch make if it runs away into an infinite loop +ifeq "$(MAKE_RESTARTS)" "" +else ifeq "$(MAKE_RESTARTS)" "1" +else ifeq "$(MAKE_RESTARTS)" "2" +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 @@ -128,7 +108,8 @@ comma=, .SUFFIXES: # ----------------------------------------------------------------------------- -# Makefile debugging +# Makefile debugging +# # to see the effective value used for a Makefile variable, do # make show VALUE=MY_VALUE # @@ -139,18 +120,31 @@ show: # ----------------------------------------------------------------------------- # Include subsidiary build-system bits -include mk/config.mk +include mk/tree.mk +ifeq "$(findstring clean,$(MAKECMDGOALS))" "" +include mk/config.mk ifeq "$(ProjectVersion)" "" $(error Please run ./configure first) endif +endif + +include mk/ways.mk # (Optional) build-specific configuration include mk/custom-settings.mk +ifeq "$(findstring clean,$(MAKECMDGOALS))" "" ifeq "$(GhcLibWays)" "" $(error $$(GhcLibWays) is empty, it must contain at least one way) endif +endif + +# ----------------------------------------------------------------------------- +# Utility definitions + +include rules/trace.mk +include rules/make-command.mk # ----------------------------------------------------------------------------- # Macros for standard targets @@ -173,20 +167,15 @@ ifneq "$(findstring clean,$(MAKECMDGOALS))" "" NO_INCLUDE_DEPS = YES NO_INCLUDE_PKGDATA = YES endif +ifneq "$(findstring bootstrapping-files,$(MAKECMDGOALS))" "" +NO_INCLUDE_DEPS = YES +NO_INCLUDE_PKGDATA = YES +endif ifeq "$(findstring show,$(MAKECMDGOALS))" "show" NO_INCLUDE_DEPS = YES # We want package-data.mk for show endif -# We don't haddock base3-compat, as it has the same package name as base -libraries/base3-compat_dist-install_DO_HADDOCK = NO - -# 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 - # ----------------------------------------------------------------------------- # Ways @@ -198,7 +187,6 @@ $(foreach way,$(ALL_WAYS),\ # ----------------------------------------------------------------------------- # Compilation Flags -include rules/distdir-opts.mk include rules/distdir-way-opts.mk # ----------------------------------------------------------------------------- @@ -209,25 +197,26 @@ include rules/c-sources.mk include rules/includes-sources.mk include rules/hs-objs.mk include rules/c-objs.mk +include rules/cmm-objs.mk # ----------------------------------------------------------------------------- # Suffix rules +# Suffix rules cause "make clean" to fail on Windows (trac #3233) +# so we don't make any when cleaning. +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 +include rules/cmm-suffix-rules.mk + +endif # CLEANING=YES # ----------------------------------------------------------------------------- # Building package-data.mk files from .cabal files @@ -261,6 +250,8 @@ 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 +include rules/extra-packages.mk # ----------------------------------------------------------------------------- # Registering hand-written package descriptions (used in libffi and rts) @@ -278,101 +269,170 @@ include rules/docbook.mk include rules/bindist.mk # ----------------------------------------------------------------------------- -# Building libraries +# Directories -# XXX generate from $(TOP)/packages -PACKAGES = \ - ghc-prim \ - integer-gmp \ - base \ - filepath \ - array \ - bytestring \ - containers +# Don't try to delete directories: +.PRECIOUS: %/. -ifeq "$(Windows)" "YES" -PACKAGES += Win32 -else -PACKAGES += unix -endif +# 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 += \ - old-locale \ - old-time \ - directory \ - process \ - random \ - extensible-exceptions \ - haskell98 \ - hpc \ - packedstring \ - pretty \ - syb \ - template-haskell \ - base3-compat \ - Cabal \ - mtl \ - utf8-string +# ----------------------------------------------------------------------------- +# 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 + +# 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/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 haskell98 haskell2010 + +# 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 -ifneq "$(Windows)" "YES" -PACKAGES += terminfo -endif +# These packages are installed, but are installed hidden +# Why install them at all? Because the 'ghc' package depends on them +HIDDEN_PACKAGES = binary -PACKAGES += haskeline +# $(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 -ifneq "$(wildcard libraries/dph)" "" -PACKAGES += \ - dph/dph-base \ - dph/dph-prim-interface \ - dph/dph-prim-seq \ - dph/dph-prim-par \ - dph/dph-seq \ - dph/dph-par -endif -BOOT_PKGS = Cabal hpc extensible-exceptions +# -------------------------------- +# 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. +# -# The actual .a and .so/.dll files: needed for dependencies. -ALL_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_LIB)) -ifeq "$(BuildSharedLibs)" "YES" -ALL_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB)) -endif -BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB)) +define addPackageGeneral +# args: $1 = PACKAGES variable, $2 = package, $3 = condition + ifeq "$3" "" + $1 += $2 + else + ifeq "$$(CLEANING)" "YES" + $1 += $2 + else + ifeq $3 + $1 += $2 + endif + endif + endif +endef -OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o -ifeq "$(BuildSharedLibs)" "YES" -OTHER_LIBS += libffi/libHSffi$(dyn_libsuf) +define addPackage # args: $1 = package, $2 = condition +ifeq "$(filter $1,$(STAGE2_PACKAGES))" "$1" +$(call addPackageGeneral,PACKAGES_STAGE2,$1,$2) +else +$(call addPackageGeneral,PACKAGES,$1,$2) endif -ifeq "$(HaveLibGmp)" "NO" -OTHER_LIBS += gmp/libgmp.a +endef + +$(eval $(call addPackage,ghc-prim)) +ifeq "$(CLEANING)" "YES" +$(eval $(call addPackage,integer-gmp)) +$(eval $(call addPackage,integer-simple)) +else +$(eval $(call addPackage,$(INTEGER_LIBRARY))) endif +$(eval $(call addPackage,base)) +$(eval $(call addPackage,filepath)) +$(eval $(call addPackage,array)) +$(eval $(call addPackage,bytestring)) +$(eval $(call addPackage,containers)) + +$(eval $(call addPackage,Win32,($$(Windows),YES))) +$(eval $(call addPackage,unix,($$(Windows),NO))) + +$(eval $(call addPackage,old-locale)) +$(eval $(call addPackage,old-time)) +$(eval $(call addPackage,time)) +$(eval $(call addPackage,directory)) +$(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,mtl)) +$(eval $(call addPackage,utf8-string)) +$(eval $(call addPackage,xhtml)) +$(eval $(call addPackage,terminfo,($$(Windows),NO))) +$(eval $(call addPackage,haskeline)) + +$(eval $(call extra-packages)) + +# ------------------------------------------- +# 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 -# 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),$(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),libraries/$(pkg)/dist-install/package-data.mk) +# 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))) + +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 # 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-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/runghc/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. @@ -380,7 +440,27 @@ libraries/ghc-prim/dist-install/package-data.mk : rts/package.conf.inplace rts/package.conf.inplace : libffi/package.conf.inplace endif -# ----------------------------------------------------------------------------- +# -------------------------------- +# Misc package-related settings + +BOOT_PKG_CONSTRAINTS := $(foreach p,$(STAGE0_PACKAGES),--constraint "$p == $(shell grep -i "^Version:" libraries/$p/$p.cabal | sed "s/[^0-9.]//g")") + +# 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)) +# A useful pseudo-target +.PHONY: stage1_libs +stage1_libs : $(ALL_STAGE1_LIBS) + +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 @@ -400,13 +480,43 @@ endef PRIMOPS_TXT = $(GHC_COMPILER_DIR)/prelude/primops.txt -libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-wrappers <$(PRIMOPS_TXT) >$@ +libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) | $$(dir $$@)/. + "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers <$(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 + +# ---------------------------------------- +# 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 +endif -libraries/ghc-prim/GHC/Prim.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - $(GENPRIMOP_INPLACE) --make-haskell-source <$(PRIMOPS_TXT) >$@ +# ---------------------------------------------- +# Checking packages with 'cabal check' + +ifeq "$(CHECK_PACKAGES)" "YES" +all: check_packages +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. +# 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 # ----------------------------------------------------------------------------- # Include build instructions from all subdirs @@ -445,23 +555,24 @@ libraries/ghc-prim/GHC/Prim.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) # # The rest : libraries/*/dist-install, compiler/stage2, ghc/stage2 -BUILD_DIRS = - ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ - $(GHC_MKDEPENDC_DIR) \ $(GHC_MKDIRHIER_DIR) endif BUILD_DIRS += \ - gmp \ docs/users_guide \ - libraries/Cabal/doc \ - $(GHC_MANGLER_DIR) \ - $(GHC_SPLIT_DIR) \ + docs/ext-core \ + docs/man \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) +ifneq "$(GhcUnregisterised)" "YES" +BUILD_DIRS += \ + $(GHC_MANGLER_DIR) \ + $(GHC_SPLIT_DIR) +endif + ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ $(GHC_GENPRIMOP_DIR) @@ -471,23 +582,37 @@ BUILD_DIRS += \ driver \ driver/ghci \ driver/ghc \ + driver/haddock \ libffi \ includes \ rts ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ + bindisttest \ $(GHC_CABAL_DIR) \ $(GHC_GENAPPLY_DIR) endif BUILD_DIRS += \ utils/haddock \ - $(patsubst %, libraries/%, $(PACKAGES)) \ + utils/haddock/doc + +ifneq "$(CLEANING)" "YES" +BUILD_DIRS += \ + $(patsubst %, libraries/%, $(PACKAGES)) +endif + +ifeq "$(INTEGER_LIBRARY)" "integer-gmp" +BUILD_DIRS += libraries/integer-gmp/gmp +endif + +BUILD_DIRS += \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ - utils/hasktags \ + utils/testremove \ + utils/ghctags \ utils/hpc \ utils/runghc \ ghc @@ -496,11 +621,25 @@ BUILD_DIRS += \ $(GHC_TOUCHY_DIR) endif +ifneq "$(BINDIST)" "YES" +BUILD_DIRS += \ + utils/mkUserGuidePart +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]. ifeq "$(phase)" "0" -$(foreach lib,$(BOOT_PKGS),$(eval \ +$(foreach lib,$(STAGE0_PACKAGES),$(eval \ libraries/$(lib)_dist-boot_DISABLE = YES)) endif @@ -517,37 +656,54 @@ 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/hasktags_dist_DISABLE = YES utils/hsc2hs_dist-install_DISABLE = YES utils/ghc-pkg_dist-install_DISABLE = YES +utils/mkUserGuidePart_dist_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),$(eval \ +$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ libraries/$(lib)_dist-install_DISABLE = YES)) endif -ifneq "$(wildcard libraries/dph)" "" -include libraries/dph/ghc.mk -endif 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 +# ---------------------------------------------- +# 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))) + +# Add $(GhcBootLibHcOpts) to all stage0 package builds +$(foreach pkg,$(STAGE0_PACKAGES),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) -# Add $(GhcLibHcOpts) to all library builds -$(foreach pkg,$(PACKAGES),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) +# ----------------------------------------------- +# Haddock-related bits -# XXX we configure packages with the bootsrapping compiler (for -# dependency reasons, see the phase ordering), which doesn't -# necessarily support all the extensions we need, and Cabal filters -# out the ones it thinks aren't supported. -libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports +# 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) + cd libraries && sh gen_contents_index --inplace +$(eval $(call all-target,library_doc_index,libraries/index.html)) +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 # ----------------------------------------------------------------------------- # Bootstrapping libraries @@ -557,9 +713,11 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports ifneq "$(BINDIST)" "YES" +ifneq "$(BOOTSTRAPPING_CONF)" "" ifeq "$(wildcard $(BOOTSTRAPPING_CONF))" "" $(shell echo "[]" >$(BOOTSTRAPPING_CONF)) endif +endif $(eval $(call clean-target,$(BOOTSTRAPPING_CONF),,$(BOOTSTRAPPING_CONF))) @@ -569,25 +727,57 @@ $(eval $(call clean-target,$(BOOTSTRAPPING_CONF),,$(BOOTSTRAPPING_CONF))) $(eval $(call build-package,libraries/hpc,dist-boot,0)) $(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)) # 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))) +$(foreach pkg,$(STAGE0_PACKAGES),$(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/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) : $(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 +# 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) + +# 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) + +ifeq "$(UseArchivesForGhci)" "NO" +ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS) +endif -$(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) +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 # ----------------------------------------------------------------------------- @@ -595,166 +785,297 @@ 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) + "$(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) $(MKDIRHIER) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-source < $< > $@ + $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ + | $$(dir $$@)/. + "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ - $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-wrappers < $< > $@ + $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ + | $$(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_libexec_scripts install_bins install_topdirs +ifeq "$(HADDOCK_DOCS)" "YES" +install: install_docs +endif 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 $(libdir) $(DESTDIR)$(bindir)/$$i ; \ - fi ; \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ; \ done install_libs: $(INSTALL_LIBS) - $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" for i in $(INSTALL_LIBS); do \ case $$i in \ *.a) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ - $(RANLIB) $(DESTDIR)$(libdir)/`basename $$i` ;; \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ + $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *.dll) \ - $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \ + $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ *.so) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ - install_name_tool -id $(DESTDIR)$(libdir)/`basename $$i` $(DESTDIR)$(libdir)/`basename $$i` ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \ *) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ esac; \ done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) - $(MKDIRHIER) $(DESTDIR)$(libexecdir) +ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" "" + @: +else + $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ done +endif install_libexecs: $(INSTALL_LIBEXECS) - $(MKDIRHIER) $(DESTDIR)$(libexecdir) +ifeq "$(INSTALL_LIBEXECS)" "" + @: +else + $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \ + $(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_topdirs: $(INSTALL_TOPDIRS) + $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + for i in $(INSTALL_TOPDIRS); do \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \ done install_headers: $(INSTALL_HEADERS) - $(INSTALL_DIR) $(DESTDIR)$(headerdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)" for i in $(INSTALL_HEADERS); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(headerdir); \ + $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \ + done + +install_docs: $(INSTALL_DOCS) + $(INSTALL_DIR) "$(DESTDIR)$(docdir)" +ifneq "$(INSTALL_DOCS)" "" + for i in $(INSTALL_DOCS); do \ + $(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" +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/"; \ + 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`"; \ done +endif -INSTALLED_PACKAGE_CONF=$(DESTDIR)$(libdir)/package.conf +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_PKG_REAL=$(DESTDIR)$(libexecdir)/ghc-pkg +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_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)) + +# 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 + +# Now we can do the installation install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - $(MKDIRHIER) $(DESTDIR)$(libdir) - echo "[]" > $(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, $(PACKAGES),\ - $(GHC_CABAL_INPLACE) install \ - $(INSTALLED_GHC_PKG_REAL) \ - $(INSTALLED_PACKAGE_CONF) \ - libraries/$p dist-install \ - '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' &&) true - $(GHC_CABAL_INPLACE) install \ - $(INSTALLED_GHC_PKG_REAL) \ - $(INSTALLED_PACKAGE_CONF) \ - compiler stage2 \ - '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' + $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + "$(RM)" $(RM_OPTS_REC) "$(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_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 +ifneq "$(CLEANING)" "YES" +# This rule seems to hold some files open on Windows which prevents +# cleaning, perhaps due to the $(wildcard). + $(eval $(call bindist,.,\ LICENSE \ + README \ + INSTALL \ configure config.sub config.guess install-sh \ extra-gcc-opts.in \ + packages \ Makefile \ mk/config.mk.in \ $(INPLACE_BIN)/mkdirhier \ $(INPLACE_BIN)/ghc-cabal \ utils/ghc-pwd/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 \ $(INSTALL_HEADERS) \ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ + $(INSTALL_TOPDIRS) \ $(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,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \ - mk/fix_install_names.sh \ + $(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 \ + 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 # the bindist with a relative path -binary-dist: - $(RM) -rf $(BIN_DIST_NAME) - mkdir $(BIN_DIST_NAME) - set -e; for i in LICENSE compiler ghc rts libraries utils gmp 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_NAME)/; done - ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac - cd $(BIN_DIST_NAME) && autoreconf - $(RM) -f $(BIN_DIST_TAR) +BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk + +unix-binary-dist-prep: + "$(RM)" $(RM_OPTS_REC) bindistprep/ + "$(MKDIRHIER)" $(BIN_DIST_PREP_DIR) + 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 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) + 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 # tree then we want to include the real file, not a symlink to it - $(TAR) hcf - -T $(BIN_DIST_LIST) | bzip2 -c >$(BIN_DIST_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_REC) bindistprep/ + $(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install + cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) + +windows-installer: +ifeq "$(ISCC_CMD)" "" + @echo No ISCC_CMD, so not making installer +else + "$(ISCC_CMD)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss +endif + +# 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), \ + ) -nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done +# 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 try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) +endif + +.PHONY: publish-docs +publish-docs: + $(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) # ----------------------------------------------------------------------------- # Source distributions @@ -784,16 +1105,14 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS = mk rules docs distrib bindisttest gmp 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 \ - ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk - -EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/%, $(shell grep -E "extralibs|dph" packages | grep -v "^\#" | sed "s/ .*//")) + ghc.spec.in ghc.spec extra-gcc-opts.in VERSION \ + boot boot-pkgs packages ghc.mk -SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2 -SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2 +SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2 VERSION : echo $(ProjectVersion) >VERSION @@ -801,48 +1120,40 @@ VERSION : sdist : VERSION # Use: -# $(call sdist_file,compiler,stage2,cmm,CmmLex,x) -# to copy the generated file that replaces compiler/cmm/CmmLex.x, where +# $(call sdist_file,compiler,stage2,cmm,Foo/Bar,CmmLex,x) +# to copy the generated file that replaces compiler/cmm/Foo/Bar/CmmLex.x, where # "stage2" is the dist dir. -sdist_file = \ - if test -f $(TOP)/$1/$2/build/$4.hs; then \ - $(CP) $(TOP)/$1/$2/build/$4.hs $1/$3/ ; \ - mv $1/$3/$4.$5 $1/$3/$4.$5.source ;\ - else \ - echo "does not exist: $1/$2//build/$4.hs"; \ - exit 1; \ - fi +define sdist_file + "$(CP)" $1/$2/build/$4/$5.hs $(SRC_DIST_DIR)/$1/$3/$4 + mv $(SRC_DIST_DIR)/$1/$3/$4/$5.$6 $(SRC_DIST_DIR)/$1/$3/$4/$5.$6.source +endef .PHONY: sdist-prep sdist-prep : - $(RM) -rf $(SRC_DIST_DIR) - $(RM) $(SRC_DIST_NAME).tar.gz + "$(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 \ - && for i in $(SRC_DIST_FILES); do $(LN_S) $(TOP)/$$i .; done \ - && $(MAKE) distclean \ - && if test -f $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(TOP)/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 \ - && $(call sdist_file,compiler,stage2,cmm,CmmLex,x) \ - && $(call sdist_file,compiler,stage2,cmm,CmmParse,y) \ - && $(call sdist_file,compiler,stage2,main,ParsePkgConf,y) \ - && $(call sdist_file,compiler,stage2,parser,HaddockLex,x) \ - && $(call sdist_file,compiler,stage2,parser,HaddockParse,y) \ - && $(call sdist_file,compiler,stage2,parser,Lexer,x) \ - && $(call sdist_file,compiler,stage2,parser,Parser,y.pp) \ - && $(call sdist_file,compiler,stage2,parser,ParserCore,y) \ - && $(call sdist_file,utils/hpc,dist,,HpcParser,y) \ - && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x) \ - && $(call sdist_file,utils/genprimopcode,dist,,Parser,y) \ - && $(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" -o -name "*-darcs-backup*" \) -print | xargs $(RM) -rf \ - ) + cd $(SRC_DIST_DIR) && for i in $(SRC_DIST_DIRS); do mkdir $$i; ( cd $$i && lndir $(TOP)/$$i ); done + cd $(SRC_DIST_DIR) && for i in $(SRC_DIST_FILES); do $(LN_S) $(TOP)/$$i .; done + cd $(SRC_DIST_DIR) && $(MAKE) distclean + rm -rf $(SRC_DIST_DIR)/libraries/tarballs/ + rm -rf $(SRC_DIST_DIR)/libraries/stamp/ + $(call sdist_file,compiler,stage2,cmm,,CmmLex,x) + $(call sdist_file,compiler,stage2,cmm,,CmmParse,y) + $(call sdist_file,compiler,stage2,parser,,Lexer,x) + $(call sdist_file,compiler,stage2,parser,,Parser,y.pp) + $(call sdist_file,compiler,stage2,parser,,ParserCore,y) + $(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,Lex,x) + $(call sdist_file,utils/haddock,dist,src,Haddock,Parse,y) + 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 - $(EXTRA_LIBS) | bzip2 >$(TOP)/$(SRC_DIST_EXTRALIBS_TARBALL) - $(RM) -rf $(EXTRA_LIBS) - $(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 @@ -852,15 +1163,29 @@ sdist-manifest : $(SRC_DIST_TARBALL) # over SSH. ifneq "$(PublishLocation)" "" publish-sdist : - $(call nTimes,10,$(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist) - $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) + $(call try10Times,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) endif -ifeq "$(GhcUnregisterised)" "YES" +ifeq "$(BootingFromHc)" "YES" +# 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 @@ -869,30 +1194,87 @@ 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 + +clean : clean_files clean_libraries -clean : clean_files .PHONY: clean_files clean_files : - $(RM) $(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_REC) libraries/integer-gmp/gmp/objs + "$(RM)" $(RM_OPTS_REC) 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,$(STAGE0_PACKAGES)) + +clean_libraries: + "$(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 +# libraries/*/ghc.mk files are not included when we're cleaning. +ifeq "$(CLEANING)" "YES" +$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\ + $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install))) +endif + +clean : clean_bindistprep +.PHONY: clean_bindistprep +clean_bindistprep: + "$(RM)" $(RM_OPTS_REC) bindistprep/ distclean : clean - $(RM) config.cache config.status config.log mk/config.h mk/stamp-h - $(RM) mk/config.mk mk/are-validating.mk mk/project.mk - $(RM) extra-gcc-opts docs/users_guide/ug-book.xml - $(RM) compiler/ghc.cabal ghc/ghc-bin.cabal - $(RM) libraries/base/include/HsBaseConfig.h - $(RM) libraries/directory/include/HsDirectoryConfig.h - $(RM) libraries/process/include/HsProcessConfig.h - $(RM) libraries/unix/include/HsUnixConfig.h - $(RM) libraries/old-time/include/HsTimeConfig.h + "$(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) compiler/ghc.cabal compiler/ghc.cabal.old + "$(RM)" $(RM_OPTS) ghc/ghc-bin.cabal + "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h + "$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h + "$(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) $(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_REC) $(patsubst %, libraries/%/autom4te.cache, $(PACKAGES) $(PACKAGES_STAGE2)) maintainer-clean : distclean - $(RM) configure mk/config.h.in - $(RM) -r autom4te.cache libraries/*/autom4te.cache - $(RM) ghc.spec - $(RM) libraries/*/GNUmakefile libraries/*/ghc.mk libraries/*/configure - $(RM) libraries/base/include/HsBaseConfig.h.in - $(RM) libraries/directory/include/HsDirectoryConfig.h.in - $(RM) libraries/process/include/HsProcessConfig.h.in - $(RM) libraries/unix/include/HsUnixConfig.h.in - $(RM) libraries/old-time/include/HsTimeConfig.h.in + "$(RM)" $(RM_OPTS) configure mk/config.h.in + "$(RM)" $(RM_OPTS_REC) autom4te.cache libraries/*/autom4te.cache + "$(RM)" $(RM_OPTS) ghc.spec + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/GNUmakefile, \ + $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/ghc.mk, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/configure, \ + $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h.in + "$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h.in + "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h.in + "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h.in + "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h.in + +.PHONY: all_libraries + +.PHONY: bootstrapping-files +bootstrapping-files: $(OTHER_LIBS) +bootstrapping-files: includes/ghcautoconf.h +bootstrapping-files: includes/DerivedConstants.h +bootstrapping-files: includes/GHCConstants.h + +.DELETE_ON_ERROR: +