[project @ 1998-06-21 18:44:12 by sof]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 14195e9..8ddf3e2 100644 (file)
--- 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=
@@ -230,7 +227,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 +239,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,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
@@ -612,6 +600,7 @@ REAL_SHELL=$(SHELL)
 SIZE                   = size
 STRIP                  = strip
 TAR                    = @TarCmd@
+ZIP                    = zip
 
 #
 # Under cygwin32, we have to deal with .exe suffixes