projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
10e589a
..
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
#
# t : ticky-ticky profiling
# debug_t : debugging ticky-ticky profiling
#
-ifeq "$(BootingFromHc)" "YES"
GhcRTSWays=
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
endif
# Option flags to pass to GHC when it's compiling modules in
@@
-502,6
+508,10
@@
FPTOOLS_TOP_ABS = @hardtop@
# The platform specific version of 'hardtop'.
FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
# 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
#
# Installation directories, we don't use half of these,
# but since the configure script has them on offer while
@@
-775,6
+785,8
@@
MKDIRHIER = $(GHC_MKDIRHIER_DIR)/$(GHC_MKDIRHIER_PGM)
LNDIR = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
RUNTEST = $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM)
LNDIR = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
RUNTEST = $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM)
+GENERATED_FILE = chmod a-w
+
#-----------------------------------------------------------------------------
# Haskell compilers and mkdependHS
#-----------------------------------------------------------------------------
# Haskell compilers and mkdependHS
@@
-817,11
+829,11
@@
GhcPatchLevel = @ProjectPatchLevel@
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
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_601 = YES
ghc_ge_602 = YES
ghc_ge_603 = YES
ghc_ge_605 = YES
+ghc_ge_607 = YES
else # not UseStage1 or BootingFromHc
else # not UseStage1 or BootingFromHc
@@
-833,11
+845,11
@@
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
# Some useful GHC version predicates:
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_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
endif
# Canonicalised ghc version number, used for easy (integer) version
@@
-1002,6
+1014,10
@@
UNAME = uname
# GTK+
GTK_CONFIG = @GTK_CONFIG@
# 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
#-----------------------------------------------------------------------------
# DocBook XML stuff