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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a698741..7bd9106 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -143,10 +143,13 @@ 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.01	# treated as a  *string*
-GhcProjectVersionInt   = 301	# treated as an *integer* (for cpp defines)
+GhcProjectVersion      = 3.02
+GhcProjectVersionInt   = 302
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -246,7 +249,12 @@ else
 ifeq "$(strip $(way))" "mr"
 GhcLibHcOpts= -O
 else
+ifeq "$(GhcWithHscBuiltViaC)" "NO"
 GhcLibHcOpts= -O -split-objs -odir $*
+else
+#NB: .hc files need to distributed in *unsplit* form.
+GhcLibHcOpts= -O
+endif
 endif
 endif
 
@@ -320,7 +328,6 @@ HappyBinDistShScripts = happy
 #
 #################################################################################
 
-
 #################################################################################
 #
 #		nofib project
@@ -337,10 +344,9 @@ 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.
@@ -496,6 +502,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/
@@ -526,6 +534,11 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
+# GMP Library
+#
+HaveLibGmp	= @HaveLibGmp@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX			= @LEX@
@@ -545,10 +558,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