From db91b1f9037f6c5fc02347e386e403946b9bbb0a Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 31 May 2007 13:28:42 +0000 Subject: [PATCH] FIX unregisterised build Can't check $(GhcUnregisterised) eagerly, because it might not have been set yet (it's set in build.mk). --- mk/config.mk.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index ae7b743..83c188b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -350,9 +350,9 @@ GhcRTSWays += debug endif # Want the threaded versions unless we're unregisterised -ifeq "$(GhcUnregisterised)" "NO" -GhcRTSWays += thr thr_p thr_debug -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_p thr_debug,) # Option flags to pass to GHC when it's compiling modules in # fptools/libraries. Typically these are things like -O or -- 1.7.10.4