From 02b3c1a0c42a22d5aa46d339f772e11905663374 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 3 Sep 2007 10:38:29 +0000 Subject: [PATCH] GhcThreaded was bogusly off by default due to things being in the wrong order --- mk/config.mk.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 249da9e..a670cd5 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -218,11 +218,6 @@ GhcStage1HcOpts= GhcStage2HcOpts= GhcStage3HcOpts= -ifneq "$(findstring thr, $(GhcRTSWays))" "" -GhcThreaded=YES -else -GhcThreaded=NO -endif GhcProfiled=NO GhcDebugged=NO @@ -361,6 +356,13 @@ endif # be set in build.mk, which hasn't been read yet. GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_p thr_debug,) +# We can only build GHCi threaded if we have a threaded RTS: +ifneq "$(findstring thr, $(GhcRTSWays))" "" +GhcThreaded=YES +else +GhcThreaded=NO +endif + # Option flags to pass to GHC when it's compiling modules in # fptools/libraries. Typically these are things like -O or # -dcore-lint or -H32m. The ones that are *essential* are wired into -- 1.7.10.4