summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/validate-settings.mk14
1 files changed, 11 insertions, 3 deletions
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 03f4e71060..fa54300a5c 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -7,6 +7,9 @@ SRC_HC_WARNING_OPTS =
HADDOCK_DOCS = YES
+#####################
+# Warnings
+
# Debian doesn't turn -Werror=unused-but-set-variable on by default, so
# we turn it on explicitly for consistency with other users
ifeq "$(GccLT46)" "NO"
@@ -16,11 +19,16 @@ SRC_CC_WARNING_OPTS += -Wno-error=inline
endif
SRC_CC_OPTS += $(WERROR) -Wall
-SRC_HC_OPTS += $(WERROR) -Wall -H64m -O0
+SRC_HC_OPTS += $(WERROR) -Wall
+
+GhcStage1HcOpts += -fwarn-tabs
+GhcStage2HcOpts += -fwarn-tabs
-GhcStage1HcOpts += -O -fwarn-tabs
+#####################
+SRC_HC_OPTS += -H64m -O0
-GhcStage2HcOpts += -O -fwarn-tabs -dcore-lint
+GhcStage1HcOpts += -O
+GhcStage2HcOpts += -O -dcore-lint
# Using -O (rather than -O0) here bringes my validate down from 22mins to 16 mins.
# Compiling stage2 takes longer, but we gain a faster haddock, faster
# running of the tests, and faster building of the utils to be installed