X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4bff39bf2b379b70f64d29dfa06ab650b232ec2b;hb=d4f1ad72f0c3c7a1f4747336c86f7d0a179e68cd;hp=14195e9a0969280a54f1e1610317459d6dcf4303;hpb=4a9c03c46eaabcf43bf8851893e7f70a47be185e;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 14195e9..4bff39b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -121,16 +121,6 @@ ProjectsToInstall = glafp-utils ghc
 #
 IncludeTestDirsInBuild=NO
 
-#
-# Name variables for the main project
-#
-Project		  = Ghc
-ProjectName       = $($(Project)ProjectName)
-ProjectNameShort  = $($(Project)ProjectNameShort)
-ProjectVersion    = $($(Project)ProjectVersion)
-ProjectVersionInt = $($(Project)ProjectVersionInt)
-ProjectPatchLevel = $($(Project)ProjectPatchLevel)
-
 #################################################################################
 #
 #		GHC project
@@ -140,21 +130,11 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 #
 #################################################################################
 
-#
-# 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
-GhcProjectVersion      = 3.02
-GhcProjectVersionInt   = 302
-GhcProjectPatchLevel   = 0
-
 #---------------------------------------------------------------
 #
 # Variables that control how the compiler itself is built
+#
+#---------------------------------------------------------------
 
 # Specify the Haskell compiler to be used to compile the compiler itself
 #
@@ -167,10 +147,7 @@ GhcProjectPatchLevel   = 0
 #		       	     HC_ROJEMO_NHC
 #		       	     HC_UNSPECIFIED
 
-WithGhcHc = ghc-2.10
-
-# Unused, we think
-# WithGhcHcType=HC_GLASGOW_GHC
+WithGhcHc = @WithGhcHc@
 
 # 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)
@@ -230,7 +207,7 @@ BuildingProfilingConcurrent=$(subst mr,YES,$(filter mr,$(WAYS)))
 # profiled prelude libraries.
 # When booting from .hc files, turn this off.
 ifeq "$(GhcWithHscBuiltViaC)" "YES"
-GhcLibWays
+GhcLibWays=
 else
 GhcLibWays=p
 endif
@@ -242,25 +219,11 @@ endif
 # 	-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
-else
 ifeq "$(GhcWithHscBuiltViaC)" "YES"
 GhcLibHcOpts=-O
 else
 GhcLibHcOpts=-O -split-objs -odir $*
 endif
-endif
-endif
 
 # Build the Haskell Readline bindings?
 #
@@ -275,14 +238,15 @@ ReadlineIncludePath=
 #
 GhcLibsWithSockets=YES
 
-# what to include in a binary distribution
+# 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
 
-GhcMainDir = ghc
-GhcBinDistDirs = ghc
-GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries
-GhcBinDistPrlScripts = ghc-$(GhcProjectVersion) stat2resid hstags mkdependHS
-GhcBinDistLibPrlScripts = hscpp
-GhcBinDistBins = hp2ps
+# Include compiler support for letting the compiler (optionally) report
+# your compilation to a central server for generation of fun stats.
+#
+GhcReportCompiles=YES
 
 #################################################################################
 #
@@ -292,15 +256,6 @@ GhcBinDistBins = hp2ps
 #
 #################################################################################
 
-#
-# Name variables for happy:
-#
-HappyProjectName       = Happy
-HappyProjectNameShort  = happy
-HappyProjectVersion    = 1.5
-HappyProjectVersionInt = 15
-HappyProjectPatchLevel = 0
-
 # The compiler you'd like to use to compile Happy
 WithHappyHc = $(WithGhcHc)
 
@@ -309,13 +264,6 @@ WithHappyHc = $(WithGhcHc)
 #
 HappyHcOpts = 
 
-# what to include in a binary distribution
-
-HappyMainDir = happy
-HappyBinDistDirs = happy
-HappyBinDistDocs = happy/doc
-HappyBinDistShScripts = happy
-
 #################################################################################
 #
 #		haggis project
@@ -528,7 +476,7 @@ MKDEPENDHS	= $(HC)
 #
 HaveGcc 	= @HaveGcc@
 UseGcc  	= YES
-WhatGccIsCalled = gcc
+WhatGccIsCalled = @WhatGccIsCalled@
 ifeq "$(strip $(HaveGcc))" "YES"
 ifneq "$(strip $(UseGcc))"  "YES"
   CC	= cc
@@ -541,12 +489,15 @@ endif
 # GMP Library
 #
 HaveLibGmp	= @HaveLibGmp@
+LibGmp		= @LibGmp@
 
 #-----------------------------------------------------------------------------
 # Flex
 
 FLEX			= @LEX@
-FLEX_LIB		= @LEXLIB@
+# Don't bother with -lfl, we define our own yywrap()s anyway.
+FLEX_LIB		= 
+#WAS:FLEX_LIB		= @LEXLIB@
 
 #-----------------------------------------------------------------------------
 # Other standard (ha!) Unix utilities
@@ -612,6 +563,7 @@ REAL_SHELL=$(SHELL)
 SIZE			= size
 STRIP			= strip
 TAR			= @TarCmd@
+ZIP			= zip
 
 #
 # Under cygwin32, we have to deal with .exe suffixes