summaryrefslogtreecommitdiff
path: root/mk/flavours
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-08-25 17:30:18 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-09-08 10:05:16 +0200
commita15860749ae5353d58cc8907b291ac15d430fc8e (patch)
tree63b00fe77e4586ec2a47cebc5b3b0415916ed960 /mk/flavours
parent864a9c4f83156caacae5777b3ad6b93b4da9c242 (diff)
downloadhaskell-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 'mk/flavours')
-rw-r--r--mk/flavours/validate.mk9
1 files changed, 6 insertions, 3 deletions
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.