X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=948d34b32e7d3dba9637ea2fbec1e68c348d75e4;hb=8968073e164d4bc513e54ded0070d49c1ab1c22f;hp=91c0deb9512a02ce10046f7550c8db2d4bfe6d4b;hpb=75b08d02787f657140a6c65e9419e6a911816ec5;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index 91c0deb..948d34b 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -1,13 +1,14 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Manuel M. T. Chakravarty <chak@acm.org>, June 2000
+# Updated for GHC 5.00, Simon Marlow, March 2001
 #
 # Script to build GHC from .hc files (must be run in the fptools/ root
 # directory into which the source and .hc files must already have been
 # unpacked).  All options are passed through to ./configure (especially
 # useful with --prefix).
 
-configopts="$*"
+configopts="$*"         # e.g., --enable-hc-boot-unregisterised
 
 # check for GNU make
 #
@@ -24,10 +25,7 @@ fi
 # build configuration
 #
 cat >mk/build.mk <<END
-ProjectsToBuild = glafp-utils hslibs ghc
-GhcLibHcOpts = -O
-SRC_HAPPY_OPTS += -c
-GhcLibWays=
+# nothing!
 END
 
 # touch happy generated files; so that in non-bootstrapping mode for
@@ -35,12 +33,53 @@ END
 #
 touch ghc/compiler/rename/ParseIface.hs
 touch ghc/compiler/parser/Parser.hs
+touch ghc/compiler/main/ParsePkgConf.hs
 
 echo "*** Building hsc..."
-./configure --enable-hc-boot $configopts        || exit 1
-$MAKE boot all                                  || exit 1
+./configure --enable-hc-boot $configopts
+$MAKE -C glafp-utils boot all
+$MAKE -C ghc boot
+$MAKE -C hslibs boot all
+$MAKE -C ghc all
+
+echo "*** Building libraries..."
+
+# 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.
 
-echo "*** Building library..."
-echo "GhcWithHscBuiltViaC=NO" >>mk/build.mk
-$MAKE -C ghc/lib clean boot all			|| exit 1
-$MAKE -C hslibs  clean boot all