X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=9be5f3f146173739b84f361350efafec09935dab;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=a698741e9bd6bd5cf4e644f1b02d96c2e4e7df74;hpb=9e233cb4a7769554f27388176b4a19931ea971c3;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a698741..9be5f3f 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,18 +130,11 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 #
 #################################################################################
 
-#
-# Name variables for ghc:
-# 
-GhcProjectName         = The Glorious Glasgow Haskell Compilation System
-GhcProjectNameShort    = ghc
-GhcProjectVersion      = 3.01	# treated as a  *string*
-GhcProjectVersionInt   = 301	# treated as an *integer* (for cpp defines)
-GhcProjectPatchLevel   = 0
-
 #---------------------------------------------------------------
 #
 # Variables that control how the compiler itself is built
+#
+#---------------------------------------------------------------
 
 # Specify the Haskell compiler to be used to compile the compiler itself
 #
@@ -164,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)
@@ -189,7 +169,7 @@ GhcCompilerWays=
 GhcHcOpts=
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=NO
+GhcWithHscBuiltViaC=@BootingFromHc@
 
 # Build hsc with -O and turn optimising flag on when compiling
 # the intermediate C file
@@ -213,10 +193,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)))
 
 #---------------------------------------------------------------
 #
@@ -225,7 +203,12 @@ BuildingProfilingConcurrent=$(subst mr,YES,$(filter mr,$(WAYS)))
 # What extra ways to build the libraries in
 # In addition to the normal sequential way, the default is to also build
 # profiled prelude libraries.
+# When booting from .hc files, turn this off.
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibWays=
+else
 GhcLibWays=p
+endif
 
 # Option flags to pass to GHC when it's compiling prelude modules
 # Typically these are things like -O or -dcore-lint
@@ -234,22 +217,20 @@ GhcLibWays=p
 # 	-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
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibHcOpts=-O
 else
-GhcLibHcOpts= -O -split-objs -odir $*
-endif
+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 +244,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
 
 #################################################################################
 #
@@ -280,15 +262,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)
 
@@ -297,13 +270,6 @@ WithHappyHc = $(WithGhcHc)
 #
 HappyHcOpts = 
 
-# what to include in a binary distribution
-
-HappyMainDir = happy
-HappyBinDistDirs = happy
-HappyBinDistDocs = happy/doc
-HappyBinDistShScripts = happy
-
 #################################################################################
 #
 #		haggis project
@@ -320,7 +286,6 @@ HappyBinDistShScripts = happy
 #
 #################################################################################
 
-
 #################################################################################
 #
 #		nofib project
@@ -337,18 +302,17 @@ HappyBinDistShScripts = happy
 #	real
 #	parallel
 #	PRIVATE
-#	GHC_ONLY
 #	PENDING
 #	UNUSED
-NoFibSubDirs = imaginary spectral real GHC_ONLY PRIVATE
+NoFibSubDirs = imaginary spectral real
 
 # The different ways to build nofib. Default is just to mirror
 # what is done for the ghc prelude libraries.
 #
-NoFibWays=$(GhcLibWays)
+NoFibWays = $(GhcLibWays)
 
 # Haskell compiler options for nofib
-NoFibHcOpts=
+NoFibHcOpts = -O
 
 # ==============================================================================
 #
@@ -496,6 +460,8 @@ TEXI2HTML_PREFIX        = $(LITERATE_PREFIX)texi2html/
 HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
 GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
 
+RTS_PREFIX		= $(FPTOOLS_TOP)/common-rts/
+
 UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
 UGEN_PREFIX             = $(FPTOOLS_TOP)/ghc/utils/ugen/
 STAT2RESID_PREFIX       = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
@@ -516,7 +482,7 @@ MKDEPENDHS	= $(HC)
 #
 HaveGcc 	= @HaveGcc@
 UseGcc  	= YES
-WhatGccIsCalled = gcc
+WhatGccIsCalled = @WhatGccIsCalled@
 ifeq "$(strip $(HaveGcc))" "YES"
 ifneq "$(strip $(UseGcc))"  "YES"
   CC	= cc
@@ -526,10 +492,18 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
+# 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
@@ -545,10 +519,9 @@ COMPRESS_SUFFIX         = @CompressSuffix@
 
 CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
-CPP			= @RAWCPP@
+CPP			= @CPP@
 CTAGS 			= $(ETAGS)
 RAWCPP                  = @RAWCPP@
-GNUCPP                  = @GNUCPP@
 INSTALL			= @INSTALL@
 #
 # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@ -596,6 +569,7 @@ REAL_SHELL=$(SHELL)
 SIZE			= size
 STRIP			= strip
 TAR			= @TarCmd@
+ZIP			= zip
 
 #
 # Under cygwin32, we have to deal with .exe suffixes
@@ -705,20 +679,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
 
@@ -726,41 +701,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=