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 a47a215..ae7b743 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -316,9 +316,6 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 HscIfaceFileVersion=6
 
-# Building with debugger?
-GhciWithDebugger=YES
-
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -345,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
@@ -505,6 +508,10 @@ FPTOOLS_TOP_ABS            = @hardtop@
 # The platform specific version of 'hardtop'.
 FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 
+BIN_DIST_NAME=ghc-$(ProjectVersion)
+BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
+BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
+
 #
 # Installation directories, we don't use half of these,
 # but since the configure script has them on offer while
@@ -778,6 +785,8 @@ MKDIRHIER           = $(GHC_MKDIRHIER_DIR)/$(GHC_MKDIRHIER_PGM)
 LNDIR                  = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
 RUNTEST                        = $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM)
 
+GENERATED_FILE  = chmod a-w
+
 #-----------------------------------------------------------------------------
 # Haskell compilers and mkdependHS
 
@@ -820,11 +829,11 @@ GhcPatchLevel     = @ProjectPatchLevel@
 GhcMajVersion  = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 
-ghc_ge_504 = YES
 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
 
@@ -836,11 +845,11 @@ GhcMajVersion     = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 
 # Some useful GHC version predicates:
-ghc_ge_504 = @ghc_ge_504@
 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
@@ -1005,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
 
@@ -1155,6 +1168,10 @@ WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 WAY_debug_u_NAME=debug unregisterised
 WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg
 
+# Way 'debug_t':
+WAY_debug_t_NAME=debug ticky-ticky profiling
+WAY_debug_t_HC_OPTS= -ticky -optc-DDEBUG
+
 # Way 'thr_debug':
 WAY_thr_debug_NAME=threaded
 WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG
@@ -1233,3 +1250,11 @@ WAY_o_HC_OPTS=
 # GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
 # SplitObjs=NO
 
+################################################################################
+#
+#    Library configure arguments
+#
+################################################################################
+
+CONFIGURE_ARGS = @CONFIGURE_ARGS@
+