X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=4850720242ba4f1100d273e8f8d0764914ed7343;hp=2bee6d672af2570bbd5f78aa2b41142d4fb16ed5;hb=83d563cb9ede0ba792836e529b1e2929db926355;hpb=4108894c6e92887fe03c2397ff5a8c424413aad6 diff --git a/ghc.mk b/ghc.mk index 2bee6d6..4850720 100644 --- a/ghc.mk +++ b/ghc.mk @@ -12,12 +12,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 +21,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 +32,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 'perl 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 @@ -101,6 +90,10 @@ endif just-makefiles: @: +ifneq "$(CLEANING)" "YES" +CLEANING = NO +endif + # ----------------------------------------------------------------------------- # Misc GNU make utils @@ -115,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 # @@ -147,6 +141,12 @@ endif endif # ----------------------------------------------------------------------------- +# Utility definitions + +include rules/trace.mk +include rules/make-command.mk + +# ----------------------------------------------------------------------------- # Macros for standard targets include rules/all-target.mk @@ -176,14 +176,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 +208,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 @@ -270,6 +251,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 +269,92 @@ 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 + +# 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 + +# 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 +ifeq "$(filter $1,$(STAGE2_PACKAGES))" "$1" +$(call addPackageGeneral,PACKAGES_STAGE2,$1,$2) +else +$(call addPackageGeneral,PACKAGES,$1,$2) +endif +endef + $(eval $(call addPackage,ghc-prim)) ifeq "$(CLEANING)" "YES" $(eval $(call addPackage,integer-gmp)) @@ -327,6 +379,7 @@ $(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)) @@ -336,40 +389,13 @@ $(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)) -$(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 +$(eval $(call extra-packages)) -BOOT_PKG_CONSTRAINTS := $(foreach p,$(BOOT_PKGS),--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,$(BOOT_PKGS),$(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 +# ------------------------------------------- +# 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 @@ -403,8 +429,10 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # 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. @@ -412,20 +440,27 @@ 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)) +# 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 @@ -451,6 +486,38 @@ 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 +# ---------------------------------------- +# 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 + +# ---------------------------------------------- +# 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 @@ -488,8 +555,6 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins # # The rest : libraries/*/dist-install, compiler/stage2, ghc/stage2 -BUILD_DIRS = - ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ $(GHC_MKDIRHIER_DIR) @@ -499,7 +564,6 @@ BUILD_DIRS += \ docs/users_guide \ docs/ext-core \ docs/man \ - libraries/Cabal/doc \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) @@ -518,6 +582,7 @@ BUILD_DIRS += \ driver \ driver/ghci \ driver/ghc \ + driver/haddock \ libffi \ includes \ rts @@ -529,22 +594,15 @@ BUILD_DIRS += \ $(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 endif @@ -563,6 +621,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 @@ -576,7 +639,7 @@ endif # Note [lib-depends]. ifeq "$(phase)" "0" -$(foreach lib,$(BOOT_PKGS),$(eval \ +$(foreach lib,$(STAGE0_PACKAGES),$(eval \ libraries/$(lib)_dist-boot_DISABLE = YES)) endif @@ -589,18 +652,6 @@ 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 @@ -609,6 +660,7 @@ utils/ghctags_dist_DISABLE = YES utils/hpc_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 @@ -618,20 +670,8 @@ $(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 - include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) -# We need -fno-warn-deprecated-flags to avoid failure with -Werror -GhcLibHcOpts += -fno-warn-deprecated-flags -GhcBootLibHcOpts += -fno-warn-deprecated-flags - # ---------------------------------------------- # Per-package compiler flags # @@ -641,27 +681,21 @@ GhcBootLibHcOpts += -fno-warn-deprecated-flags # libraries/_dist-boot_HC_OPTS += -Wwarn # libraries/_dist-install_HC_OPTS += -Wwarn - -# Add $(GhcLibHcOpts) to all library builds +# Add $(GhcLibHcOpts) to all package builds $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts))) -# XXX Hack; remove this -# Use -Wwarn for dph -$(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn)) - -# XXX Hack; remove this -# Use -Wwarn for 'binary' becuase it has redundant UNPACK pragmas -libraries/binary_dist-install_HC_OPTS += -Wwarn -libraries/binary_dist-boot_HC_OPTS += -Wwarn +# Add $(GhcBootLibHcOpts) to all stage0 package builds +$(foreach pkg,$(STAGE0_PACKAGES),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) -# XXX hack: xhtml has warnings -libraries/xhtml_dist-install_HC_OPTS += -Wwarn +# ----------------------------------------------- +# Haddock-related bits -# ---------------------------------------------- -# A useful pseudo-target -.PHONY: stage1_libs -stage1_libs : $(ALL_STAGE1_LIBS) +# 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 @@ -671,10 +705,6 @@ 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 @@ -704,7 +734,7 @@ $(eval $(call build-package,libraries/bin-package-db,dist-boot,0)) # 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 \ @@ -726,8 +756,6 @@ $(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB) # 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,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) - # Make sure we have all the GHCi libs by the time we've built # ghc-stage2. DPH includes a bit of Template Haskell which needs the # GHCI libs, and we don't have a better way to express that dependency. @@ -735,8 +763,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 # ----------------------------------------------------------------------------- @@ -782,8 +823,10 @@ TAGS: TAGS_compiler # Installation install: install_packages install_libs install_libexecs install_headers \ - install_libexec_scripts install_bins install_docs \ - install_topdirs + install_libexec_scripts install_bins install_topdirs +ifeq "$(HADDOCK_DOCS)" "YES" +install: install_docs +endif install_bins: $(INSTALL_BINS) $(INSTALL_DIR) "$(DESTDIR)$(bindir)" @@ -880,28 +923,22 @@ 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 xhtml,$(PACKAGES)) +INSTALLED_PKG_DIRS := $(addprefix libraries/,$(PACKAGES)) \ + compiler \ + $(addprefix libraries/,$(PACKAGES_STAGE2)) ifeq "$(InstallExtraPackages)" "NO" -INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) +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)) -HIDDEN_PACKAGES = binary - -define set_INSTALL_DISTDIR -# $1 = libraries/base, $2 = dist-install -# => -# INSTALL_DISTDIR_libraries/base = dist-install -INSTALL_DISTDIR_$1 = $2 -endef - -$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\ -$(call set_INSTALL_DISTDIR,libraries/$p,dist-install))) +# 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)" @@ -909,18 +946,23 @@ install_packages: libffi/package.conf.install rts/package.conf.install $(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_CMD)" \ - "$(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 @@ -935,6 +977,7 @@ $(eval $(call bindist,.,\ INSTALL \ configure config.sub config.guess install-sh \ extra-gcc-opts.in \ + packages \ Makefile \ mk/config.mk.in \ $(INPLACE_BIN)/mkdirhier \ @@ -971,6 +1014,9 @@ $(eval $(call bindist,.,\ 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 @@ -981,7 +1027,7 @@ 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 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 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) @@ -1171,7 +1217,7 @@ 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_REC) $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2))