X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7267ee5ab47ff6f1587db32c91522d5763f526d2;hb=658b3650867707a3be0a5a2f8e8124421cec348c;hp=7c1e262f7644e2477e1f181aca9e7ce29ffb37e5;hpb=4a30fe22ba4cc967847b946a0ad875098a91c305;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7c1e262..7267ee5 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -86,6 +86,8 @@ HostVendor_CPP	                = @HostVendor_CPP@
 #
 LeadingUnderscore=@LeadingUnderscore@
 
+# Pin a suffix on executables? If so, what. (cygwin32 only).
+exeext=
 
 #################################################################################
 #
@@ -109,12 +111,12 @@ LeadingUnderscore=@LeadingUnderscore@
 #		* ghc&hslibs next
 #		then it's up to you
 
-ProjectsToBuild   = glafp-utils literate ghc hslibs
+ProjectsToBuild   = glafp-utils literate happy ghc hslibs
 #
 # Make a distinction between building and installing, ProjectsToInstall
 # does not include the literate bits..
 #
-ProjectsToInstall = glafp-utils ghc hslibs
+ProjectsToInstall = glafp-utils happy ghc hslibs
 
 #
 # Should the various project tests directories be built?
@@ -133,12 +135,18 @@ IncludeTestDirsInBuild=NO
 #
 # Name variables for ghc:
 # 
-GhcProjectName       =The Glorious Glasgow Haskell Compilation System
-GhcProjectNameShort  =ghc
-GhcProjectVersion    =2.05
-GhcProjectPatchLevel =0
-GhcBuildeeVersion    =205
-GhcBuilderVersion    =29
+GhcProjectName         = The Glorious Glasgow Haskell Compilation System
+GhcProjectNameShort    = ghc
+GhcProjectVersion      = 2.09
+GhcProjectPatchLevel   = 0
+
+#
+# Name variables for happy:
+#
+HappyProjectName       = Happy
+HappyProjectNameShort  = happy
+HappyProjectVersion    = 1.4
+HappyProjectPatchLevel = 0
 
 #
 # Name variables for the fptools, for now equal to the above
@@ -155,18 +163,23 @@ ProjectPatchLevel =$(GhcProjectPatchLevel)
 # Variables that control how the compiler itself is built
 
 # Specify the Haskell compiler to be used to compile the compiler itself
-#   WithGhcHc	Path name of the compiler to use
-#   Ghc2_0	Whether this compiler is GHC 2.0 or later
-#		(which affects gruesome details about
-# 		 how mutually recursive modules are handled)
-#   WithGhcHcType	What "type" of compiler is being used
-#			Valid options:
+#
+#   WithGhcHc	   Path name of the compiler to use
+#
+#   Ghc2_0	   Whether this compiler is GHC 2.0 or later
+#		   (which affects gruesome details about
+# 		   how mutually recursive modules are handled)
+#
+#   WithGhcHcType  What "type" of compiler is being used
+#		   Valid options:
 #		       	     HC_CHALMERS_HBC
 #		       	     HC_GLASGOW_GHC
 #		       	     HC_ROJEMO_NHC
 #		       	     HC_UNSPECIFIED
+
 WithGhcHc = ghc-0.29
 Ghc2_0=NO
+
 # Unused, we think
 # WithGhcHcType=HC_GLASGOW_GHC
 
@@ -177,9 +190,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?
@@ -203,9 +223,6 @@ GhcWithRegisterised=YES
 #   i386, alpha & sparc
 GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi)
 
-# Build the compiler with the deforester included?
-GhcWithDeforester=NO
-
 #
 # Building various ways?
 # (right now, empty if not).
@@ -227,7 +244,21 @@ 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
+
+#
+# Splitting profiled code produces awfully large archives under ELF, so
+# we turn it off here.
+#
+# ToDo: track down the source of this.
+#
+ifneq "$(strip $(way))" "p"
+GhcLibHcOpts= -O -split-objs -odir $*
+else
+GhcLibHcOpts= -O
+endif
 
 
 #################################################################################
@@ -270,6 +301,13 @@ HsLibHcOpts=$(GhcLibHcOpts)
 #
 #################################################################################
 
+# The compiler you'd like to use to compile Happy
+WithHappyHc = $(WithGhcHc)
+
+# HappyHcOpts gives the flags to pass to the Haskell compiler used
+# 	      to compile the Happy sources with.
+#
+HappyHcOpts = 
 
 
 #################################################################################
@@ -573,6 +611,12 @@ REAL_SHELL=$(SHELL)
 SIZE			= size
 STRIP			= strip
 TAR			= @TarCmd@
+
+#
+# Under cygwin32, we have to deal with .exe suffixes
+#
+EXE_SUFFIX=@ExeSuffix@
+
 #
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
@@ -603,6 +647,7 @@ ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
+HAPPY_VERSION		= @HappyVersion@		
 LX			= @LxCmd@
 GREENCARD		= @GreencardCmd@
 
@@ -610,10 +655,6 @@ ifeq "$(HAPPY)" ""
 HAPPY			= $(HAPPY_PREFIX)happy
 endif
 
-ifeq ($(Ghc2_0),NO)
-SRC_HAPPY_OPTS		= -1.2
-endif
-
 #
 # Stuff from fptools/literate
 #