X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=b064f25b9259026f19bc12daefd61e13c6c2448f;hb=9039c283717cf7bc8ccc3eaf51fb6f528555a2f8;hp=7a27b9e7ab095f03202790f61a10e4dc21f0008d;hpb=e0977075e9f29fb638732a095a386aa83dae25ba;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7a27b9e..b064f25 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -148,8 +148,8 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 
 GhcProjectName         = The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort    = ghc
-GhcProjectVersion      = 3.02
-GhcProjectVersionInt   = 302
+GhcProjectVersion      = 3.03
+GhcProjectVersionInt   = 303
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -169,9 +169,6 @@ GhcProjectPatchLevel   = 0
 
 WithGhcHc = ghc-2.10
 
-# Unused, we think
-# WithGhcHcType=HC_GLASGOW_GHC
-
 # 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)
 GhcCompilerWays=
@@ -192,7 +189,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
@@ -228,7 +225,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
@@ -237,25 +239,10 @@ 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
-ifeq "$(GhcWithHscBuiltViaC)" "NO"
-GhcLibHcOpts= -O -split-objs -odir $*
-else
-#NB: .hc files need to distributed in *unsplit* form.
-GhcLibHcOpts= -O
-endif
-endif
+GhcLibHcOpts=-O -split-objs -odir $*
 endif
 
 # Build the Haskell Readline bindings?
@@ -271,6 +258,11 @@ ReadlineIncludePath=
 #
 GhcLibsWithSockets=YES
 
+# 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
+
 # what to include in a binary distribution
 
 GhcMainDir = ghc
@@ -328,7 +320,6 @@ HappyBinDistShScripts = happy
 #
 #################################################################################
 
-
 #################################################################################
 #
 #		nofib project
@@ -345,18 +336,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
 
 # ==============================================================================
 #
@@ -536,6 +526,11 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
+# GMP Library
+#
+HaveLibGmp	= @HaveLibGmp@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX			= @LEX@
@@ -605,6 +600,7 @@ REAL_SHELL=$(SHELL)
 SIZE			= size
 STRIP			= strip
 TAR			= @TarCmd@
+ZIP			= zip
 
 #
 # Under cygwin32, we have to deal with .exe suffixes