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

4 files changed, 12 insertions, 33 deletions

diff --git a/ghc.mk b/ghc.mk
index b146d5a866..7337c27dfe 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -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
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 66301c954c..9caa2b1daa 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -302,12 +302,6 @@ SupportsSplitObjs := $(strip \
 SplitObjs=$(SupportsSplitObjs)
 
 # ----------------------------------------------------------------------------
-# Package-related things
-
-# Whether to install the extra packages
-InstallExtraPackages = NO
-
-# ----------------------------------------------------------------------------
 
 # There are a number of things which technically depend on GHC (e.g. if
 # ghc changes then Haskell files may be compiled differently, or Cabal
@@ -768,9 +762,9 @@ else
 HSCOLOUR_SRCS = YES
 endif
 
-# Build DPH?
+# Build and install DPH?
 BUILD_DPH = NO
-# Build the "extra" packages (see ./packages)?
+# Build and install the "extra" packages (see ./packages)?
 BUILD_EXTRA_PKGS = NO
 
 ################################################################################
diff --git a/mk/flavours/validate.mk b/mk/flavours/validate.mk
index 6c92914525..7f74356f05 100644
--- a/mk/flavours/validate.mk
+++ b/mk/flavours/validate.mk
@@ -12,11 +12,14 @@ BUILD_DOCBOOK_PDF  = NO
 ifeq "$(ValidateHpc)" "YES"
 GhcStage2HcOpts   += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
 endif
+
 ifeq "$(ValidateSpeed)" "SLOW"
 GhcStage2HcOpts   += -DDEBUG
 endif
 
-InstallExtraPackages = YES
+ifneq "$(ValidateSpeed)" "FAST"
+BUILD_EXTRA_PKGS=YES
+endif
 
 WERROR             = -Werror
 
@@ -40,5 +43,5 @@ WERROR             = -Werror
 # markup is correct, so we turn off PS and PDF doc building when
 # validating.
 #
-# We set InstallExtraPackages=YES, because we want to install the "extra"
-# packages, so that we can test them.
+# We set BUILD_EXTRA_PKGS=YES to build the "extra" packages (see ./packages),
+# so that we can test them.
diff --git a/validate b/validate
index 188605ddb4..4c123fe844 100755
--- a/validate
+++ b/validate
@@ -193,11 +193,6 @@ if [ $be_quiet -eq 1 ]; then
     echo "V=0"                  >> mk/are-validating.mk # Less gunk
 fi
 
-if [ $speed != "FAST" ]; then
-    # Build the "extra" packages (see ./packages), to enable more tests.
-    echo "BUILD_EXTRA_PKGS=YES" >> mk/are-validating.mk
-fi
-
 if [ $use_dph -eq 1 ]; then
     echo "BUILD_DPH=YES"    >> mk/are-validating.mk
 else