Commit b97c7238 authored by sof's avatar sof

[project @ 1997-09-03 23:18:41 by sof]

version nos upped to 2.06; added -O to GhcLibHcOpts; added HAPPY_VERSION
parent 4b98b6ad
...@@ -135,9 +135,9 @@ IncludeTestDirsInBuild=NO ...@@ -135,9 +135,9 @@ IncludeTestDirsInBuild=NO
# #
GhcProjectName =The Glorious Glasgow Haskell Compilation System GhcProjectName =The Glorious Glasgow Haskell Compilation System
GhcProjectNameShort =ghc GhcProjectNameShort =ghc
GhcProjectVersion =2.05 GhcProjectVersion =2.06
GhcProjectPatchLevel =0 GhcProjectPatchLevel =0
GhcBuildeeVersion =205 GhcBuildeeVersion =206
GhcBuilderVersion =29 GhcBuilderVersion =29
# #
...@@ -177,9 +177,16 @@ GhcCompilerWays= ...@@ -177,9 +177,16 @@ GhcCompilerWays=
# Extra option flags to pass to the compiler that compiles the compiler # Extra option flags to pass to the compiler that compiles the compiler
# (Ones that are essential are wired into ghc/compiler/Makefile) # (Ones that are essential are wired into ghc/compiler/Makefile)
# Typical ones: # Typical ones:
# -O compiler an optimised compiler # -H25m allocate a bigger heap (default is 6m)
#
# -O compile an optimised compiler
# NB! If you add -O you'll almost certainly need to increase
# the amount of heap space too (to 15m or more)
#
# -DDEBUG include consistency/assertion checks in the compiled compiler # -DDEBUG include consistency/assertion checks in the compiled compiler
# -fshow-import-specs show import specialisations #
# -dcore-lint check the types after every pass of the compiler;
# a pretty strong internal check
GhcHcOpts= GhcHcOpts=
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files? # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
...@@ -227,7 +234,11 @@ GhcLibWays=p ...@@ -227,7 +234,11 @@ GhcLibWays=p
# Option flags to pass to GHC when it's compiling prelude modules # Option flags to pass to GHC when it's compiling prelude modules
# Typically these are things like -O or -dcore-lint # Typically these are things like -O or -dcore-lint
# The ones that are *essential* are wired into ghc/lib/Makefile # The ones that are *essential* are wired into ghc/lib/Makefile
GhcLibHcOpts= -split-objs -odir $(basename $*) #
# -O is pretty desirable, otherwise no inlining of prelude
# things (incl "+") happens when compiling with this compiler
GhcLibHcOpts= -O -split-objs -odir $(basename $*)
################################################################################# #################################################################################
...@@ -270,6 +281,9 @@ HsLibHcOpts=$(GhcLibHcOpts) ...@@ -270,6 +281,9 @@ HsLibHcOpts=$(GhcLibHcOpts)
# #
################################################################################# #################################################################################
# HappyHcOpts gives the flags to pass to the Haskell compiler used
# to compile the Happy source coed
HappyHcOpts =
################################################################################# #################################################################################
...@@ -417,9 +431,6 @@ endif ...@@ -417,9 +431,6 @@ endif
# #
# SRC_HC_OPTS += -O # SRC_HC_OPTS += -O
ifeq ($(Ghc2_0),NO)
SRC_HAPPY_OPTS += -1.2
endif
################################################################################# #################################################################################
# #
...@@ -606,6 +617,7 @@ ETAGS = $(ETAGS_PREFIX)etags ...@@ -606,6 +617,7 @@ ETAGS = $(ETAGS_PREFIX)etags
VERBATIM = $(VERBATIM_PREFIX)verbatim VERBATIM = $(VERBATIM_PREFIX)verbatim
RUNTEST = $(RUNTEST_PREFIX)runstdtest RUNTEST = $(RUNTEST_PREFIX)runstdtest
HAPPY = @HappyCmd@ HAPPY = @HappyCmd@
HAPPY_VERSION = @HappyVersion@
LX = @LxCmd@ LX = @LxCmd@
GREENCARD = @GreencardCmd@ GREENCARD = @GreencardCmd@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment