Commit 043d70f0 authored by Simon Marlow's avatar Simon Marlow

sanitise naming of package lists

The *predicates* all start with "PKGS_THAT_...", e.g.:

  PKGS_THAT_BUILD_WITH_STAGE0   (previously "PACKAGES_STAGE0")
  PKGS_THAT_BUILD_WITH_STAGE2   (previously "STAGE2_PACKAGES")
  PKGS_THAT_USE_TH              (previously "TH_PACKAGES)
  etc. (there are a few more)

the lists of packages to build are now consistently named:

  PACKAGES_STAGE0
  PACKAGES_STAGE1  (previously just "PACKAGES")
  PACKAGES_STAGE2
parent 78e6b615
......@@ -174,8 +174,8 @@ sub boot_pkgs {
or die "Opening $package/ghc.mk failed: $!";
print GHCMK "${package}_PACKAGE = ${pkg}\n";
print GHCMK "${package}_dist-install_GROUP = libraries\n";
print GHCMK "\$(if \$(filter ${dir},\$(PACKAGES_STAGE0)),\$(eval \$(call build-package,${package},dist-boot,0)))\n";
print GHCMK "\$(eval \$(call build-package,${package},dist-install,\$(if \$(filter ${dir},\$(STAGE2_PACKAGES)),2,1)))\n";
print GHCMK "\$(if \$(filter ${dir},\$(PKGS_THAT_BUILD_WITH_STAGE0)),\$(eval \$(call build-package,${package},dist-boot,0)))\n";
print GHCMK "\$(eval \$(call build-package,${package},dist-install,\$(if \$(filter ${dir},\$(PKGS_THAT_BUILD_WITH_STAGE2)),2,1)))\n";
close GHCMK
or die "Closing $package/ghc.mk failed: $!";
......
This diff is collapsed.
......@@ -97,7 +97,7 @@ ifneq "$(BINDIST)" "YES"
ghc/stage1/build/tmp/$(ghc_stage1_PROG) : $(BOOT_LIBS)
ifeq "$(GhcProfiled)" "YES"
ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_p_LIB)
ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_p_LIB))
ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(foreach lib,$(PACKAGES_STAGE1),$(libraries/$(lib)_dist-install_p_LIB))
endif
# Modules here import HsVersions.h, so we need ghc_boot_platform.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment