X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=3bffb6ac4f04eed2e746c9eb160166c28dee8a88;hb=50027272414438955dbc41696541cbd25da55883;hp=2ef7c4d90bfc397d76ca20a8f865cf8a84d41753;hpb=6392539ea09c6e5d99cdeb07770b80c0ad9cf073;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2ef7c4d..3bffb6a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -97,8 +97,11 @@ exeext=@exeext@
 #
 ################################################################################
 
+# BootingFromHc - build GHC and the libraries from .hc files?
+BootingFromHc = @BootingFromHc@
+
 # build the libs first if we're bootstrapping from .hc files
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
+ifeq "$(BootingFromHc)" "YES"
 AllProjects = glafp-utils hslibs ghc green-card happy hdirect hood nofib
 else
 AllProjects = glafp-utils ghc hslibs green-card happy hdirect hood nofib
@@ -156,9 +159,6 @@ GhcCompilerWays=
 #			a pretty strong internal check
 GhcHcOpts=-O -Rghc-timing
 
-# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
-GhcWithHscBuiltViaC=@BootingFromHc@
-
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
 # run without any support for architecture-specific assembly mangling,
@@ -214,7 +214,7 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 # 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"
+ifeq "$(BootingFromHc)" "YES"
 GhcLibWays=
 else
 GhcLibWays=p
@@ -231,14 +231,18 @@ endif
 GhcLibHcOpts=-O -Rghc-timing
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
-# Don't split object files for libs if we're building DLLs
 DLLized=@EnableWin32DLLs@
+
+# Don't split object files for libs if we're building DLLs, or booting from
+# .hc files.
+SplitObjs=YES
+
 ifeq "$(DLLized)" "YES"
 SplitObjs=NO
-else
-SplitObjs=YES
 endif
-
+ifeq "$(BootingFromHc)" "YES"
+SplitObjs=NO
+endif
 
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
@@ -575,6 +579,9 @@ else
 endif
 endif
 
+# default C compiler flags
+SRC_CC_OPTS = -O
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #