Build Windows installer when making a bindist if ISCC is set

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5fea4b2..ae7b743 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -342,10 +342,16 @@ endif
 #   t          : ticky-ticky profiling
 #   debug_t    : debugging ticky-ticky profiling
 #
-ifeq "$(BootingFromHc)" "YES"
 GhcRTSWays=
-else
-GhcRTSWays=thr thr_p debug thr_debug
+
+# Usually want the debug version
+ifeq "$(BootingFromHc)" "NO"
+GhcRTSWays += debug 
+endif
+
+# Want the threaded versions unless we're unregisterised
+ifeq "$(GhcUnregisterised)" "NO"
+GhcRTSWays += thr thr_p thr_debug
 endif
 
 # Option flags to pass to GHC when it's compiling modules in
@@ -827,6 +833,7 @@ ghc_ge_601 = YES
 ghc_ge_602 = YES
 ghc_ge_603 = YES
 ghc_ge_605 = YES
+ghc_ge_607 = YES
 
 else # not UseStage1 or BootingFromHc
 
@@ -842,6 +849,7 @@ ghc_ge_601 = @ghc_ge_601@
 ghc_ge_602 = @ghc_ge_602@
 ghc_ge_603 = @ghc_ge_603@
 ghc_ge_605 = @ghc_ge_605@
+ghc_ge_607 = @ghc_ge_607@
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version
@@ -1006,6 +1014,10 @@ UNAME                    = uname
 # GTK+
 GTK_CONFIG = @GTK_CONFIG@
 
+# Set this if you want to use Inno Setup to build a Windows installer
+# when you make a bindist
+ISCC                    =
+
 #-----------------------------------------------------------------------------
 # DocBook XML stuff