[project @ 1998-05-27 11:58:56 by simonm]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index d0e0ce1..fe081e9 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -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=
@@ -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,11 @@ 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
-else
 ifeq "$(GhcWithHscBuiltViaC)" "YES"
 GhcLibHcOpts=-O
 else
 GhcLibHcOpts=-O -split-objs -odir $*
 endif
-endif
-endif
 
 # Build the Haskell Readline bindings?
 #
@@ -270,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
@@ -350,10 +343,10 @@ 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
 
 # ==============================================================================
 #