projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1998-05-27 11:58:56 by simonm]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
538c1ba
..
fe081e9
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-128,6
+128,7
@@
Project = Ghc
ProjectName = $($(Project)ProjectName)
ProjectNameShort = $($(Project)ProjectNameShort)
ProjectVersion = $($(Project)ProjectVersion)
ProjectName = $($(Project)ProjectName)
ProjectNameShort = $($(Project)ProjectNameShort)
ProjectVersion = $($(Project)ProjectVersion)
+ProjectVersionInt = $($(Project)ProjectVersionInt)
ProjectPatchLevel = $($(Project)ProjectPatchLevel)
#################################################################################
ProjectPatchLevel = $($(Project)ProjectPatchLevel)
#################################################################################
@@
-142,9
+143,13
@@
ProjectPatchLevel = $($(Project)ProjectPatchLevel)
#
# Name variables for ghc:
#
#
# Name variables for ghc:
#
+# *ProjectVersion is treated as a *string*
+# *ProjectVersionInt is treated as an *integer* (for cpp defines)
+
GhcProjectName = The Glorious Glasgow Haskell Compilation System
GhcProjectNameShort = ghc
GhcProjectName = The Glorious Glasgow Haskell Compilation System
GhcProjectNameShort = ghc
-GhcProjectVersion = 3.01
+GhcProjectVersion = 3.02
+GhcProjectVersionInt = 302
GhcProjectPatchLevel = 0
#---------------------------------------------------------------
GhcProjectPatchLevel = 0
#---------------------------------------------------------------
@@
-164,9
+169,6
@@
GhcProjectPatchLevel = 0
WithGhcHc = ghc-2.10
WithGhcHc = ghc-2.10
-# Unused, we think
-# WithGhcHcType=HC_GLASGOW_GHC
-
# Extra ways in which to build the compiler (for example, you might want to
# build a profiled compiler so you can see where it spends its time)
GhcCompilerWays=
# Extra ways in which to build the compiler (for example, you might want to
# build a profiled compiler so you can see where it spends its time)
GhcCompilerWays=
@@
-187,7
+189,7
@@
GhcCompilerWays=
GhcHcOpts=
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
GhcHcOpts=
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=NO
+GhcWithHscBuiltViaC=@BootingFromHc@
# Build hsc with -O and turn optimising flag on when compiling
# the intermediate C file
# Build hsc with -O and turn optimising flag on when compiling
# the intermediate C file
@@
-223,7
+225,12
@@
BuildingProfilingConcurrent=$(subst mr,YES,$(filter mr,$(WAYS)))
# What extra ways to build the libraries in
# In addition to the normal sequential way, the default is to also build
# profiled prelude libraries.
# What extra ways to build the libraries in
# In addition to the normal sequential way, the default is to also build
# profiled prelude libraries.
+# When booting from .hc files, turn this off.
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibWays
+else
GhcLibWays=p
GhcLibWays=p
+endif
# Option flags to pass to GHC when it's compiling prelude modules
# Typically these are things like -O or -dcore-lint
# Option flags to pass to GHC when it's compiling prelude modules
# Typically these are things like -O or -dcore-lint
@@
-232,20
+239,10
@@
GhcLibWays=p
# -O is pretty desirable, otherwise no inlining of prelude
# things (incl "+") happens when compiling with this compiler
# -O is pretty desirable, otherwise no inlining of prelude
# things (incl "+") happens when compiling with this compiler
-#
-# Splitting profiled code produces awfully large archives under ELF, so
-# we turn it off here.
-#
-# ToDo: track down the source of this.
-#
-ifeq "$(strip $(way))" "p"
-GhcLibHcOpts= -O
-else
-ifeq "$(strip $(way))" "mr"
-GhcLibHcOpts= -O
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibHcOpts=-O
else
else
-GhcLibHcOpts= -O -split-objs -odir $*
-endif
+GhcLibHcOpts=-O -split-objs -odir $*
endif
# Build the Haskell Readline bindings?
endif
# Build the Haskell Readline bindings?
@@
-261,6
+258,11
@@
ReadlineIncludePath=
#
GhcLibsWithSockets=YES
#
GhcLibsWithSockets=YES
+# Strip local symbols from libraries? This can make the libraries smaller,
+# but makes debugging somewhat more difficult. Doesn't work with all ld's.
+#
+StripLibraries=NO
+
# what to include in a binary distribution
GhcMainDir = ghc
# what to include in a binary distribution
GhcMainDir = ghc
@@
-284,6
+286,7
@@
GhcBinDistBins = hp2ps
HappyProjectName = Happy
HappyProjectNameShort = happy
HappyProjectVersion = 1.5
HappyProjectName = Happy
HappyProjectNameShort = happy
HappyProjectVersion = 1.5
+HappyProjectVersionInt = 15
HappyProjectPatchLevel = 0
# The compiler you'd like to use to compile Happy
HappyProjectPatchLevel = 0
# The compiler you'd like to use to compile Happy
@@
-317,7
+320,6
@@
HappyBinDistShScripts = happy
#
#################################################################################
#
#################################################################################
-
#################################################################################
#
# nofib project
#################################################################################
#
# nofib project
@@
-334,18
+336,17
@@
HappyBinDistShScripts = happy
# real
# parallel
# PRIVATE
# real
# parallel
# PRIVATE
-# GHC_ONLY
# PENDING
# UNUSED
# PENDING
# UNUSED
-NoFibSubDirs = imaginary spectral real GHC_ONLY PRIVATE
+NoFibSubDirs = imaginary spectral real
# The different ways to build nofib. Default is just to mirror
# what is done for the ghc prelude libraries.
#
# The different ways to build nofib. Default is just to mirror
# what is done for the ghc prelude libraries.
#
-NoFibWays=$(GhcLibWays)
+NoFibWays = $(GhcLibWays)
# Haskell compiler options for nofib
# Haskell compiler options for nofib
-NoFibHcOpts=
+NoFibHcOpts = -O
# ==============================================================================
#
# ==============================================================================
#
@@
-493,6
+494,8
@@
TEXI2HTML_PREFIX = $(LITERATE_PREFIX)texi2html/
HAPPY_PREFIX = $(FPTOOLS_TOP)/happy/src/
GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/
HAPPY_PREFIX = $(FPTOOLS_TOP)/happy/src/
GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/
+RTS_PREFIX = $(FPTOOLS_TOP)/common-rts/
+
UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/
UGEN_PREFIX = $(FPTOOLS_TOP)/ghc/utils/ugen/
STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/
UGEN_PREFIX = $(FPTOOLS_TOP)/ghc/utils/ugen/
STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
@@
-523,6
+526,11
@@
endif
endif
#-----------------------------------------------------------------------------
endif
#-----------------------------------------------------------------------------
+# GMP Library
+#
+HaveLibGmp = @HaveLibGmp@
+
+#-----------------------------------------------------------------------------
# Flex
FLEX = @LEX@
# Flex
FLEX = @LEX@
@@
-542,10
+550,9
@@
COMPRESS_SUFFIX = @CompressSuffix@
CONTEXT_DIFF = @ContextDiffCmd@
CP = cp
CONTEXT_DIFF = @ContextDiffCmd@
CP = cp
-CPP = @RAWCPP@
+CPP = @CPP@
CTAGS = $(ETAGS)
RAWCPP = @RAWCPP@
CTAGS = $(ETAGS)
RAWCPP = @RAWCPP@
-GNUCPP = @GNUCPP@
INSTALL = @INSTALL@
#
# Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
INSTALL = @INSTALL@
#
# Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@
-639,7
+646,7
@@
RUNTEST = $(RUNTEST_PREFIX)runstdtest
HAPPY = @HappyCmd@
HAPPY_VERSION = @HappyVersion@
LX = @LxCmd@
HAPPY = @HappyCmd@
HAPPY_VERSION = @HappyVersion@
LX = @LxCmd@
-GREENCARD = @GreencardCmd@
+GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card
#
# Stuff from fptools/literate
#
# Stuff from fptools/literate