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 /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 'mk')
| -rw-r--r-- | mk/config.mk.in | 10 | ||||
| -rw-r--r-- | mk/flavours/validate.mk | 9 |
2 files changed, 8 insertions, 11 deletions
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. |