summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/flavours/devel1.mk4
-rw-r--r--mk/flavours/devel2.mk4
-rw-r--r--mk/flavours/validate.mk5
3 files changed, 13 insertions, 0 deletions
diff --git a/mk/flavours/devel1.mk b/mk/flavours/devel1.mk
index e062a57909..1c03aff10b 100644
--- a/mk/flavours/devel1.mk
+++ b/mk/flavours/devel1.mk
@@ -10,3 +10,7 @@ BUILD_SPHINX_PDF = NO
BUILD_MAN = NO
LAX_DEPENDENCIES = YES
+
+# Reduce optimisation when building Cabal; this makes a significant difference
+# in overall build time. See #16817.
+libraries/Cabal_dist-install_HC_OPTS += -O0
diff --git a/mk/flavours/devel2.mk b/mk/flavours/devel2.mk
index 1c8e24f745..2d7d3b3884 100644
--- a/mk/flavours/devel2.mk
+++ b/mk/flavours/devel2.mk
@@ -10,3 +10,7 @@ BUILD_SPHINX_PDF = NO
BUILD_MAN = NO
LAX_DEPENDENCIES = YES
+
+# Reduce optimisation when building Cabal; this makes a significant difference
+# in overall build time. See #16817.
+libraries/Cabal_dist-install_HC_OPTS += -O0
diff --git a/mk/flavours/validate.mk b/mk/flavours/validate.mk
index 3fd916afb0..6395d2d62f 100644
--- a/mk/flavours/validate.mk
+++ b/mk/flavours/validate.mk
@@ -27,6 +27,10 @@ endif
WERROR = -Werror
+# Reduce optimisation when building Cabal; this makes a significant difference
+# in overall build time. See #16817.
+libraries/Cabal_dist-install_HC_OPTS += -O0
+
# DO NOT EDIT THIS FILE! Instead, create a file mk/validate.mk, whose settings
# will override these. See also mk/custom-settings.mk.
#
@@ -36,6 +40,7 @@ WERROR = -Werror
#
#
# Note [validate build settings]
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Using GhcStage2HcOpts=-O (rather than -O0) here bringes my validate down from
# 22mins to 16 mins. Compiling stage2 takes longer, but we gain a faster