Commit 02b3c1a0 authored by Simon Marlow's avatar Simon Marlow

GhcThreaded was bogusly off by default due to things being in the wrong order

parent 4f87f8ca
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment