X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=948d34b32e7d3dba9637ea2fbec1e68c348d75e4;hb=1a8d01f99c116ea79fa765afc8f8f6129c5b270d;hp=e140653902fd0bdb59d8e023ce6652b440080e8f;hpb=f463e006364033aee25d792dbb5a8386ebecb5ba;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index e140653..948d34b 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -8,7 +8,7 @@
 # unpacked).  All options are passed through to ./configure (especially
 # useful with --prefix).
 
-configopts="$*"
+configopts="$*"         # e.g., --enable-hc-boot-unregisterised
 
 # check for GNU make
 #
@@ -38,17 +38,48 @@ touch ghc/compiler/main/ParsePkgConf.hs
 echo "*** Building hsc..."
 ./configure --enable-hc-boot $configopts
 $MAKE -C glafp-utils boot all
-$MAKE -C ghc/utils boot all
 $MAKE -C ghc boot
 $MAKE -C hslibs boot all
 $MAKE -C ghc all
 
 echo "*** Building libraries..."
-./configure
 
-# clean in ghc/lib, but avoid removing hsc2hs-generated .hs files
-$MAKE -C ghc/lib   clean HSC_SRCS=""
-$MAKE -C ghc/lib   boot all
+# 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"
+
+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 prelude/PrimOp.o main/Config.{hs,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.
+/usr/bin/find ghc/lib/std hslibs | grep '\.\(o\|a\)' | /usr/bin/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 ghc/lib boot all
+$MAKE -C hslibs  boot all
+
+# Finally build ghc/utils, now that we have libraries
+$MAKE -C ghc/utils boot all
+
+# At this point, the tree should be safe to do 'make install' in.
 
-$MAKE -C hslibs    clean boot all
-$MAKE -C ghc/utils clean boot all