diff options
| -rw-r--r-- | mk/config.mk.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 79e7c6b197..7e24ead05d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -263,12 +263,11 @@ ifeq "$(BootingFromHc)" "NO" GhcRTSWays += debug endif -# Want the threaded versions unless we're unregisterised -# Defer the check until later by using $(if..), because GhcUnregisterised might -# be set in build.mk, which hasn't been read yet. -GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_debug thr_l,) -GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),$(if $(findstring NO, $(GhcUnregisterised)),thr_p,),) -GhcRTSWays += $(if $(findstring dyn, $(GhcLibWays)), dyn debug_dyn $(if $(findstring NO, $(GhcUnregisterised)),thr_dyn thr_debug_dyn),) +# We always have the threaded versions, but note that SMP support may be disabled +# (see GhcWithSMP). +GhcRTSWays += thr thr_debug thr_l +GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),thr_p,) +GhcRTSWays += $(if $(findstring dyn, $(GhcLibWays)),dyn debug_dyn thr_dyn thr_debug_dyn,) # We can only build GHCi threaded if we have a threaded RTS: GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) |