X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fconfig.mk.in;h=c9b1d6c8f4d430cfa397214048b7903d38eac3d6;hb=973810c84a79fae3667a90586b32f7f583cf632a;hp=6068821b2e476610c0f87e72ea764481cefac91b;hpb=db53a2568a9c7cccaa3e3fcfde7d40762a259199;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6068821..c9b1d6c 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -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
@@ -328,7 +332,6 @@ HappyBinDistShScripts = happy
 #
 #################################################################################
 
-
 #################################################################################
 #
 #		nofib project
@@ -345,10 +348,9 @@ 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.
@@ -536,6 +538,11 @@ endif
 endif
 
 #-----------------------------------------------------------------------------
+# GMP Library
+#
+HaveLibGmp	= @HaveLibGmp@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX			= @LEX@
@@ -558,7 +565,6 @@ CP			= cp
 CPP			= @CPP@
 CTAGS 			= $(ETAGS)
 RAWCPP                  = @RAWCPP@
-GNUCPP                  = @GNUCPP@
 INSTALL			= @INSTALL@
 #
 # Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback