X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=5406c7283f952510e213f8d3a3f4f1f4dc0715ce;hb=094f9feafaf83190891736ddd8d1d7213f4293c4;hp=10e589a934cab3be017bae5ba1fb871e054170fe;hpb=fd1375dd261725eb00969a3017b924369c09835c;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 10e589a..5406c72 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -171,6 +171,12 @@ else Windows=NO endif +ifeq "$(Windows)" "YES" +dot_bat=.bat +else +dot_bat= +endif + # BootingFromHc - build GHC and the libraries from .hc files? BootingFromHc = @BootingFromHc@ @@ -342,12 +348,18 @@ 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 +# 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 # -dcore-lint or -H32m. The ones that are *essential* are wired into @@ -502,6 +514,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 @@ -742,7 +758,7 @@ GHC_TOUCHY_PGM = touchy$(exeext) GHC_MANGLER_PGM = ghc-asm GHC_SPLIT_PGM = ghc-split GHC_SYSMAN_PGM = SysMan -GHC_PKG_INPLACE_PGM = ghc-pkg-inplace +GHC_PKG_INPLACE_PGM = ghc-pkg-inplace$(dot_bat) GHC_GENPRIMOP_PGM = genprimopcode GHC_GENAPPLY_PGM = genapply GHC_MKDEPENDC_PGM = mkdependC @@ -775,6 +791,9 @@ 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 +EXECUTABLE_FILE = chmod +x + #----------------------------------------------------------------------------- # Haskell compilers and mkdependHS @@ -817,11 +836,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 @@ -833,11 +852,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 @@ -1002,6 +1021,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