summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-06-28 20:23:48 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-06-29 08:57:06 +0200
commit88d85aa65ea15d984bf207f82d99928eda0b6c26 (patch)
tree5fc62bef4111e8840a49d8eeaafada91681f6dc6 /mk
parent767b9ddf7d2ea2bb99d49372c79be129fc2058ce (diff)
downloadhaskell-88d85aa65ea15d984bf207f82d99928eda0b6c26.tar.gz
Add BUILD_DPH variable to GHC build-system
Now that the `libraries/dph` submodule is checked out always we need a different way to disable building DPH to save compile-time while developing GHC. This commit adds a new YES/NO Make variable `BUILD_DPH` that can be used inside mk/build.mk to control whether to build libraries/dph or not. The default setting is `BUILD_DPH=YES` (via `mk/config.mk.in`). This also changes `validate`'s flag `--no-dph` to explicitly disable DPH for the current validation run. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Test Plan: successful validates with `--fast --no-dph` Differential Revision: https://phabricator.haskell.org/D31
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk.sample3
-rw-r--r--mk/config.mk.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 3d47bbe82a..a323884334 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -66,6 +66,9 @@ V = 1
# working on stage 2 and want to freeze stage 1 and the libraries for
# a while.
+# Uncomment the following line to disable building DPH
+#BUILD_DPH=NO
+
GhcLibWays = $(if $(filter $(DYNAMIC_GHC_PROGRAMS),YES),v dyn,v)
# ----------- A Performance/Distribution build --------------------------------
diff --git a/mk/config.mk.in b/mk/config.mk.in
index afe48ab5e1..7a73d4632a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -790,6 +790,9 @@ else
HSCOLOUR_SRCS = YES
endif
+# Build DPH?
+BUILD_DPH = YES
+
################################################################################
#
# Library configure arguments