X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=1559cd33718221efc9b92d915bc4335d206a9866;hb=7bac51fa2ad7eb14e31ee65ad992e7e5ab3a4be5;hp=725c6da57b028f445afcf7a2720a88943209cc01;hpb=ea768ef146c6e3977f6343ee90509a94ea4aba86;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 725c6da..1559cd3 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,7 +147,11 @@ GhcProjectPatchLevel   = 0
 #		       	     HC_ROJEMO_NHC
 #		       	     HC_UNSPECIFIED
 
-WithGhcHc = ghc-2.10
+WithGhcHc = @WithGhcHc@
+
+# Variable which is set to the version number of the $(WithGhcHc) we're using.
+# Not currently used, but might come in handy sometime soon.
+#WithGhcHcVersion = $(shell echo `if ( $(WithGhcHc) --version 2>/dev/null >/dev/null ) then $(WithGhcHc) --version 2>&1 | @SedCmd@ -e 's/^.*version [^0-9]*\([.0-9]*\).*/\1/;s/\.//'; else echo unknown; fi; ` )
 
 # 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)
@@ -213,10 +197,8 @@ GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha s
 # Building various ways?
 # (right now, empty if not).
 BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
-BuildingConcurrent=$(subst mc,YES,$(filter mc,$(WAYS)))
 BuildingProfiling=$(subst p,YES,$(filter p,$(WAYS)))
 BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
-BuildingProfilingConcurrent=$(subst mr,YES,$(filter mr,$(WAYS)))
 
 #---------------------------------------------------------------
 #
@@ -227,7 +209,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
@@ -245,6 +227,14 @@ else
 GhcLibHcOpts=-O -split-objs -odir $*
 endif
 
+# Option flags to pass to GHC when it's compiling RTS modules
+# This is a good way to set things like -optc-g and -optc-DDEBUG for the RTS.
+# GhcRtsHcOpts is used when compiling .hc files.
+# GhcRtsCcOpts is used when compiling .c  files.
+
+GhcRtsHcOpts=
+GhcRtsCcOpts=
+
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=NO
@@ -263,14 +253,10 @@ GhcLibsWithSockets=YES
 #
 StripLibraries=NO
 
-# what to include in a binary distribution
-
-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
 
 #################################################################################
 #
@@ -280,29 +266,13 @@ 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)
 
 # HappyHcOpts gives the flags to pass to the Haskell compiler used
 # 	      to compile the Happy sources with.
 #
-HappyHcOpts = 
-
-# what to include in a binary distribution
-
-HappyMainDir = happy
-HappyBinDistDirs = happy
-HappyBinDistDocs = happy/doc
-HappyBinDistShScripts = happy
+HappyHcOpts = -O
 
 #################################################################################
 #
@@ -516,7 +486,7 @@ MKDEPENDHS	= $(HC)
 #
 HaveGcc 	= @HaveGcc@
 UseGcc  	= YES
-WhatGccIsCalled = gcc
+WhatGccIsCalled = @WhatGccIsCalled@
 ifeq "$(strip $(HaveGcc))" "YES"
 ifneq "$(strip $(UseGcc))"  "YES"
   CC	= cc
@@ -526,15 +496,18 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
-# GMP Library
+# GMP Library (version 2.0.x or above)
 #
 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
@@ -710,20 +683,21 @@ HSTAGS			= $(HSTAGS_PREFIX)hstags
 #
 # The ways currently defined.
 #
-ALL_WAYS=p t u mc mr mt mp mg 1s 2s du a b c d e f g h i j k l m n o A B
+ALL_WAYS=p t u mp mg a b c d e f g h i j k l m n o A B
 
 #
-# The following ways currently have treated specially, p u t mc mt my mp mg 1s 2d du,
+# The following ways currently have treated specially, p u t mg,
 # as the driver script treats these guys specially and needs to carefully be told
 # about the options for these. Hence, we hide the required command line options
 # for these in the ghc/driver, as this is the only place they are needed.
 # 
 # If you want to add to these default options, fill in the variables below:
-# 
+
+# Way 'p':
 WAY_p_NAME=profiling
 WAY_p_HC_OPTS= -prof
 
-# Way t:
+# Way 't':
 WAY_t_NAME=ticky-ticky profiling
 WAY_t_HC_OPTS= -ticky
 
@@ -731,41 +705,15 @@ WAY_t_HC_OPTS= -ticky
 WAY_u_NAME=unregisterized (using portable C only)
 WAY_u_HC_OPTS=
 
-# Way `mc': concurrent
-WAY_mc_NAME=concurrent
-WAY_mc_HC_OPTS=-concurrent
-
-# Way `mr': 
-WAY_mr_NAME=profiled concurrent
-WAY_mr_HC_OPTS=-prof -concurrent
-
-# Way `mt': 
-WAY_mt_NAME=ticky-ticky concurrent
-WAY_mt_HC_OPTS=-ticky -concurrent
-
 # Way `mp': 
 WAY_mp_NAME=parallel
 WAY_mp_HC_OPTS=-parallel
 
-#
 # Way `mg': 
-#
 WAY_mg_NAME=GranSim
 WAY_mg_HC_OPTS=-gransim
 
 #
-# Ways for different garbage collectors
-#
-WAY_2s_NAME=2-space GC
-WAY_2s_HC_OPTS=-2s
-
-WAY_1s_NAME=1-space GC
-WAY_1s_HC_OPTS=-1s
-
-WAY_du_NAME=dual-mode GC
-WAY_du_HC_OPTS=-du
-
-#
 # Add user-way configurations here:
 #
 WAY_A_NAME=