projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4f87f8c
)
GhcThreaded was bogusly off by default due to things being in the wrong order
author
Simon Marlow
<simonmar@microsoft.com>
Mon, 3 Sep 2007 10:38:29 +0000
(10:38 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Mon, 3 Sep 2007 10:38:29 +0000
(10:38 +0000)
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
249da9e
..
a670cd5
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-218,11
+218,6
@@
GhcStage1HcOpts=
GhcStage2HcOpts=
GhcStage3HcOpts=
GhcStage2HcOpts=
GhcStage3HcOpts=
-ifneq "$(findstring thr, $(GhcRTSWays))" ""
-GhcThreaded=YES
-else
-GhcThreaded=NO
-endif
GhcProfiled=NO
GhcDebugged=NO
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,)
# 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
# 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