From b97c723882908e373d8988191a71991aad976a7f Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Wed, 3 Sep 1997 23:18:41 +0000
Subject: [PATCH] [project @ 1997-09-03 23:18:41 by sof] version nos upped to
 2.06; added -O to GhcLibHcOpts; added HAPPY_VERSION

---
 mk/config.mk.in |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ca9b6ed..48fbce4 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -135,9 +135,9 @@ IncludeTestDirsInBuild=NO
 # 
 GhcProjectName       =The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort  =ghc
-GhcProjectVersion    =2.05
+GhcProjectVersion    =2.06
 GhcProjectPatchLevel =0
-GhcBuildeeVersion    =205
+GhcBuildeeVersion    =206
 GhcBuilderVersion    =29
 
 #
@@ -177,9 +177,16 @@ GhcCompilerWays=
 # Extra option flags to pass to the compiler that compiles the compiler
 # (Ones that are essential are wired into ghc/compiler/Makefile)
 # 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
-#	-fshow-import-specs	show import specialisations
+#
+#	-dcore-lint	check the types after every pass of the compiler;
+#			a pretty strong internal check
 GhcHcOpts=
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
@@ -227,7 +234,11 @@ GhcLibWays=p
 # Option flags to pass to GHC when it's compiling prelude modules
 # Typically these are things like -O or -dcore-lint
 # 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)
 #
 #################################################################################
 
+# HappyHcOpts gives the flags to pass to the Haskell compiler used
+# 	      to compile the Happy source coed
+HappyHcOpts = 
 
 
 #################################################################################
@@ -417,9 +431,6 @@ endif
 #
 #	SRC_HC_OPTS += -O
 
-ifeq ($(Ghc2_0),NO)
-SRC_HAPPY_OPTS		+= -1.2
-endif
 
 #################################################################################
 #
@@ -606,6 +617,7 @@ ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
+HAPPY_VERSION		= @HappyVersion@		
 LX			= @LxCmd@
 GREENCARD		= @GreencardCmd@
 
-- 
1.7.10.4