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:
5e5a08e
)
FIX unregisterised build
author
Simon Marlow
<marlowsd@gmail.com>
Thu, 19 Mar 2009 10:09:54 +0000
(10:09 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Thu, 19 Mar 2009 10:09:54 +0000
(10:09 +0000)
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
ae961bb
..
b83fb92
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-404,7
+404,7
@@
endif
# 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,)
# 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)),thr_p,)
+GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),$(if $(findstring NO, $(GhcUnregisterised)),thr_p,),)
# We can only build GHCi threaded if we have a threaded RTS:
GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
# We can only build GHCi threaded if we have a threaded RTS:
GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)