summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-01-03 23:54:43 +0000
committerIan Lynagh <ian@well-typed.com>2013-01-03 23:54:43 +0000
commitb9eb17c101242c7a8473da8f1b1009ea9c2a6295 (patch)
treef2e5309925b2f28b82b372cd5d04b82a952584c9 /mk
parent6d5f25f5e0b33173fb2e7983cab40808c723f220 (diff)
downloadhaskell-b9eb17c101242c7a8473da8f1b1009ea9c2a6295.tar.gz
Make validating with GhcProfiled=YES Just Work
It now takes care of adding p to the GhcLibWays, rather than just complaining that it's missing.
Diffstat (limited to 'mk')
-rw-r--r--mk/validate-settings.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 98e2340cfb..399bf0eca2 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -39,12 +39,14 @@ GhcLibHcOpts += -O -dcore-lint
# We define DefaultFastGhcLibWays in this style so that the value is
# correct even if the user alters DYNAMIC_BY_DEFAULT
DefaultFastGhcLibWays = $(if $(filter $(DYNAMIC_BY_DEFAULT),YES),dyn,v)
+DefaultProfGhcLibWays = $(if $(filter $(GhcProfiled),YES),p,)
ifeq "$(ValidateSpeed)" "FAST"
GhcLibWays = $(DefaultFastGhcLibWays)
else
GhcLibWays := $(filter v dyn,$(GhcLibWays))
endif
+GhcLibWays += $(DefaultProfGhcLibWays)
SplitObjs = NO
NoFibWays =
STRIP_CMD = :