diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-25 17:30:18 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-08 10:05:16 +0200 |
| commit | a15860749ae5353d58cc8907b291ac15d430fc8e (patch) | |
| tree | 63b00fe77e4586ec2a47cebc5b3b0415916ed960 /ghc.mk | |
| parent | 864a9c4f83156caacae5777b3ad6b93b4da9c242 (diff) | |
| download | haskell-a15860749ae5353d58cc8907b291ac15d430fc8e.tar.gz | |
Build system: delete the InstallExtraPackages variable
Just install all packages that are built. Don't make an exception for
the dph and extra packages.
You can control whether the dph and extra packages should be build using
the variables BUILD_DPH and BUILD_EXTRA_PKGS. These variables didn't
exist before. But now that they do, InstallExtraPackages isn't really
needed anymore.
Reviewed by: austin
Differential Revision: https://phabricator.haskell.org/D1227
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 21 |
1 files changed, 4 insertions, 17 deletions
@@ -423,13 +423,6 @@ endif endif PACKAGES_STAGE1 += haskeline -# We normally install only the packages down to this point -REGULAR_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1)) -ifneq "$(Stage1Only)" "YES" -REGULAR_INSTALL_PACKAGES += compiler -endif -REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2)) - ifneq "$(CrossCompiling)" "YES" define addExtraPackage ifeq "$2" "-" @@ -450,18 +443,12 @@ endef $(eval $(call foreachLibrary,addExtraPackage)) endif -# If we want to just install everything, then we want all the packages -SUPERSIZE_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1)) +# We install all packages that we build. +INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1)) ifneq "$(Stage1Only)" "YES" -SUPERSIZE_INSTALL_PACKAGES += compiler -endif -SUPERSIZE_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2)) - -ifeq "$(InstallExtraPackages)" "NO" -INSTALL_PACKAGES := $(REGULAR_INSTALL_PACKAGES) -else -INSTALL_PACKAGES := $(SUPERSIZE_INSTALL_PACKAGES) +INSTALL_PACKAGES += compiler endif +INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2)) endif # CLEANING |