X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=2a2982110487f1df6946770f5009c23cdf6ca0e0;hb=07e0ca96d26a1e317acf95497db83de0a217d5f8;hp=7bd91062fe60d27d88520cf8ad4c71f7ab5e14fb;hpb=b322894fe813986892e987def990e8ee8c7cfac0;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7bd9106..2a29821 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -148,7 +148,7 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 
 GhcProjectName         = The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort    = ghc
-GhcProjectVersion      = 3.02
+GhcProjectVersion = proto-3.02-6-May
 GhcProjectVersionInt   = 302
 GhcProjectPatchLevel   = 0
 
@@ -192,7 +192,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 +228,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
@@ -249,11 +254,10 @@ else
 ifeq "$(strip $(way))" "mr"
 GhcLibHcOpts= -O
 else
-ifeq "$(GhcWithHscBuiltViaC)" "NO"
-GhcLibHcOpts= -O -split-objs -odir $*
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+GhcLibHcOpts=-O
 else
-#NB: .hc files need to distributed in *unsplit* form.
-GhcLibHcOpts= -O
+GhcLibHcOpts=-O -split-objs -odir $*
 endif
 endif
 endif
@@ -271,6 +275,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
@@ -351,10 +360,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
 
 # ==============================================================================
 #