diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-06 10:45:50 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-06 11:31:34 +0000 |
| commit | 77e788960cad26bfdee00e0741d28fd7a78d9c22 (patch) | |
| tree | 01a9e1b85732d7f994046fce25703efab1941312 /mk | |
| parent | fe2433a2a35e5b520a5e63d6cc437efc3c2b97cf (diff) | |
| download | haskell-77e788960cad26bfdee00e0741d28fd7a78d9c22.tar.gz | |
Enable the threaded RTS when unregisterised too.
It was disabled by me in 1a470c9404950cc6737853309d35798a98ad0c30 (May
2007), but the commit gave no explanation as to why. Perhaps this was before
we had a separate knob for GhcWithSMP.
Anyway, it looks like threaded works fine with unregisterised, so I'm
enabling it again.
Diffstat (limited to 'mk')
| -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) |