Make validating with GhcProfiled=YES Just Work
authorIan Lynagh <ian@well-typed.com>
Thu, 3 Jan 2013 23:54:43 +0000 (23:54 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 3 Jan 2013 23:54:43 +0000 (23:54 +0000)
It now takes care of adding p to the GhcLibWays, rather than just
complaining that it's missing.

mk/validate-settings.mk

index 98e2340..399bf0e 100644 (file)
@@ -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       = :