X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=367cfd6d30944723f563f456aa2736b3bf54a654;hb=69a46499cfcf6797d3e326cae56f1da41704e687;hp=f52f29cfa720e082883fbf56cd18ccdc5e60ba0f;hpb=25893c9ca14a983186da89a64060128101f736d2;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index f52f29c..367cfd6 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -2,6 +2,7 @@
 
 # Manuel M. T. Chakravarty <chak@acm.org>, June 2000
 # Updated for GHC 5.00, Simon Marlow, March 2001
+# Updated for GHC 5.04.3, Urban Boquist, March 2003
 #
 # 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
@@ -9,6 +10,7 @@
 # useful with --prefix).
 
 configopts="$*"         # e.g., --enable-hc-boot-unregisterised
+PWD=`pwd`
 
 # check for GNU make
 #
@@ -24,33 +26,75 @@ fi
 
 # build configuration
 #
+case "$configopts" in
+*--enable-hc-boot-unregisterised*)
 cat >mk/build.mk <<END
-# nothing!
+GhcWithInterpreter=NO
+GhcWithNativeCodeGen=NO
+SplitObjs=NO
+GhcLibWays=
 END
+;;
 
-# touch happy generated files; so that in non-bootstrapping mode for
-# installation, no attempt is made to call happy
-#
-touch ghc/compiler/rename/ParseIface.hs
-touch ghc/compiler/parser/Parser.hs
-touch ghc/compiler/main/ParsePkgConf.hs
+*)
+cat >mk/build.mk <<END
+# empty
+END
+;;
+esac
 
-echo "*** Building hsc..."
+echo "*** Building compiler..."
 ./configure --enable-hc-boot $configopts
+
 $MAKE -C glafp-utils boot all
 $MAKE -C ghc boot
-$MAKE -C hslibs boot all
+$MAKE -C libraries boot all
 $MAKE -C ghc all
 
+MAKEFLAGS=
+
 echo "*** Building libraries..."
-GHC="$PWD/ghc/compiler/ghc-inplace" HappyCmd="$PWD/distrib/fake-happy" ./configure
 
-# make ghc/utils while we still have libraries in ghc/lib
-$MAKE -C ghc/utils clean boot
-$MAKE -C ghc/utils all
+# 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"
+
+# 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
+
+# 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
+
+# Build all of ghc/utils
+$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
+
+# 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-*)
 
-# now, clean and build the libraries
-$MAKE -C ghc/lib   clean boot
-$MAKE -C ghc/lib   all
-$MAKE -C hslibs    clean boot
-$MAKE -C hslibs    all
+# At this point, the tree should be safe to do 'make install' in.