X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=3b2b1dcde3d623d2e7aa3f3cd98d6c139108eca9;hb=e8275a4f4706e544df8624c2b6b469afaf05a8a5;hp=934183e9f633892878c8f633f633d8dcdad4d8df;hpb=c9e24437df491be465000c0d097cc1a44486bdfc;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 934183e..3b2b1dc 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=
 
 #################################################################################
 #
@@ -133,10 +135,18 @@ IncludeTestDirsInBuild=NO
 #
 # Name variables for ghc:
 # 
-GhcProjectName       =The Glorious Glasgow Haskell Compilation System
-GhcProjectNameShort  =ghc
-GhcProjectVersion    =2.07
-GhcProjectPatchLevel =0
+GhcProjectName         = The Glorious Glasgow Haskell Compilation System
+GhcProjectNameShort    = ghc
+GhcProjectVersion      = 2.08
+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
@@ -213,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).
@@ -241,7 +248,17 @@ GhcLibWays=p
 # 	-O is pretty desirable, otherwise no inlining of prelude
 #		things (incl "+") happens when compiling with this compiler
 
-GhcLibHcOpts= -O -split-objs -odir $(basename $*)
+#
+# 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
 
 
 #################################################################################
@@ -593,6 +610,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/.