X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=eba1cbe0e1212d2aedb5ca5f945e005d0ee21473;hb=6a94b79150b93cf589fd69509a09726977b86643;hp=dd9134adfb3ae54d5d19128f93da428c1ec1ab86;hpb=135045b28ff8a8d9b0b5f5cce0373387f541f600;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index dd9134a..eba1cbe 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -26,17 +26,21 @@ fi
 
 # build configuration
 #
-case configopts in
+case "$configopts" in
 *--enable-hc-boot-unregisterised*)
-    cat >mk/build.mk <<END
-    GhcWithInterpreter=NO
-    GhcWithNativeCodeGen=NO
-    END
-    ;;
+cat >>mk/build.mk <<END
+GhcWithInterpreter=NO
+GhcWithNativeCodeGen=NO
+SplitObjs=NO
+GhcLibWays=
+END
+;;
+
 *)
-    cat >mk/build.mk <<END
-    # empty
-    END
+cat >>mk/build.mk <<END
+# empty
+END
+;;
 esac
 
 echo "*** Building compiler..."
@@ -44,45 +48,46 @@ 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=
 
 echo "*** Building libraries..."
 
+# Get rid of --enable-hc-boot-unregisterised in $configotps if we had it
+configopts=`echo $configopts | sed s/--enable-hc-boot-unregisterised//`
+
 # Reconfigure, using the newly-build ghc binary as our $(GHC), and
 # with hc bootstrapping disabled.
 HappyCmd="$PWD/distrib/fake-happy" ./configure --with-ghc="$PWD/ghc/compiler/ghc-inplace" $configopts
 
 PRIMOP_BITS="primop-data-decl.hs-incl \
-            primop-tag.hs-incl  \
-            primop-list.hs-incl  \
-            primop-has-side-effects.hs-incl  \
-            primop-out-of-line.hs-incl  \
-            primop-commutable.hs-incl  \
-            primop-needs-wrapper.hs-incl  \
-            primop-can-fail.hs-incl  \
-            primop-strictness.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-*)
+	      primop-tag.hs-incl  \
+	      primop-list.hs-incl  \
+	      primop-has-side-effects.hs-incl  \
+	      primop-out-of-line.hs-incl  \
+	      primop-commutable.hs-incl  \
+	      primop-needs-wrapper.hs-incl  \
+	      primop-can-fail.hs-incl  \
+	      primop-strictness.hs-incl  \
+	      primop-usage.hs-incl  \
+	      primop-primop-info.hs-incl"
 
 # 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
+$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
@@ -90,7 +95,9 @@ $MAKE -C ghc/utils clean && $MAKE -C ghc/utils 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.