projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FastTypes - delete ugly _signatures, comment on Bool not FastBool where the typecheck...
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
d1605d1
..
5fea4b2
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-56,7
+56,8
@@
endif
# random .o-file stuff might change even if the .hi syntax doesn't
ProjectName = @ProjectName@
# random .o-file stuff might change even if the .hi syntax doesn't
ProjectName = @ProjectName@
-ProjectVersion = @ProjectVersion@
+ProjectTags =
+ProjectVersion = @ProjectVersion@$(ProjectTags)
ProjectVersionInt = @ProjectVersionInt@
ProjectPatchLevel = @ProjectPatchLevel@
ProjectVersionInt = @ProjectVersionInt@
ProjectPatchLevel = @ProjectPatchLevel@
@@
-315,9
+316,6
@@
BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
HscIfaceFileVersion=6
HscIfaceFileVersion=6
-# Building with debugger?
-GhciWithDebugger=YES
-
#------------------------------------------------------------------------------
# Options for Libraries
#------------------------------------------------------------------------------
# Options for Libraries
@@
-341,6
+339,8
@@
endif
# debug_u : debugging unregisterised
# thr_debug : debugging threaded
# thr_debug_p : debugging threaded profiled
# debug_u : debugging unregisterised
# thr_debug : debugging threaded
# thr_debug_p : debugging threaded profiled
+# t : ticky-ticky profiling
+# debug_t : debugging ticky-ticky profiling
#
ifeq "$(BootingFromHc)" "YES"
GhcRTSWays=
#
ifeq "$(BootingFromHc)" "YES"
GhcRTSWays=
@@
-502,6
+502,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
+779,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,7
+823,6
@@
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_601 = YES
ghc_ge_602 = YES
ghc_ge_603 = YES
@@
-833,7
+838,6
@@
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_601 = @ghc_ge_601@
ghc_ge_602 = @ghc_ge_602@
ghc_ge_603 = @ghc_ge_603@
@@
-1152,6
+1156,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_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
# Way 'thr_debug':
WAY_thr_debug_NAME=threaded
WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG
@@
-1230,3
+1238,11
@@
WAY_o_HC_OPTS=
# GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
# SplitObjs=NO
# GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
# SplitObjs=NO
+################################################################################
+#
+# Library configure arguments
+#
+################################################################################
+
+CONFIGURE_ARGS = @CONFIGURE_ARGS@
+