X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=1540e1575752e0959d3ff72ff8aa807a824fbf17;hb=3eaf13137ab87e4d6c3404fa0895b49a2a1b93cf;hp=f64345fbc270a992d30d03ac648f22246841eb53;hpb=f18a58d7185f1bc8b4d01a9d19a0683973eb67e9;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index f64345f..1540e15 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -28,14 +28,16 @@ fi
 #
 case "$configopts" in
 *--enable-hc-boot-unregisterised*)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
 GhcWithInterpreter=NO
 GhcWithNativeCodeGen=NO
+SplitObjs=NO
+GhcLibWays=
 END
 ;;
 
 *)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
 # empty
 END
 ;;
@@ -46,7 +48,7 @@ echo "*** Building compiler..."
 
 $MAKE -C glafp-utils boot all
 $MAKE -C ghc boot
-$MAKE -C libraries boot all
+$MAKE -C libraries boot all GhcBootLibs=YES
 $MAKE -C ghc all
 
 MAKEFLAGS=
@@ -72,30 +74,33 @@ PRIMOP_BITS="primop-data-decl.hs-incl \
 	      primop-usage.hs-incl  \
 	      primop-primop-info.hs-incl"
 
-# The reconfigure step updates a few files, which can lead to
-# unnecessary recompilations.  Touch a bunch of things here to avoid
-# having to recompile stuff that we've already built.
-(cd ghc/compiler; touch $PRIMOP_BITS parser/hschooks.o prelude/PrimOp.o main/Config.hs main/Config.o ghc-*)
-
 # Remove the old libraries.  Don't use make clean, because we don't
 # want to delete the .hs files generated from the .hsc files, because
 # we don't have hsc2hs built yet.
-find libraries hslibs | grep '\.\(o\|a\)$' | xargs rm -f
+find libraries hslibs | grep '\.[oa]$' | xargs rm -f
 
 # Do includes and RTS now
 $MAKE -C ghc/includes boot && $MAKE -C ghc/includes all
 $MAKE -C ghc/rts      boot && $MAKE -C ghc/rts      all
 
-# Now build a new set of libraries
-$MAKE -C libraries boot all
+# Now build a new set of libraries (GhcBootLibs only for now)
+$MAKE -C libraries boot all GhcBootLibs=YES
+
+# Build all of ghc/lib
+$MAKE -C ghc/lib clean && $MAKE -C ghc/lib boot all
 
 # Build all of ghc/utils
 $MAKE -C ghc/utils clean && $MAKE -C ghc/utils boot all
 
+# Build the rest of the libraries
+$MAKE -C libraries boot all
+
 # Now we can build hslibs (hsc2hs is required, so must be after ghc/utils)
 $MAKE -C hslibs  boot all
 
-# Avoid relinking the compiler during 'make install':
-(cd ghc/compiler; touch parser/hschooks.o ghc-*)
+# The reconfigure step updates a few files, which can lead to
+# unnecessary recompilations.  Touch a bunch of things here to avoid
+# having to recompile stuff that we've already built.
+(cd ghc/compiler; touch $PRIMOP_BITS parser/hschooks.o prelude/PrimOp.o main/Config.hs main/Config.o ghc-*)
 
 # At this point, the tree should be safe to do 'make install' in.