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

diff --git a/distrib/hc-build b/distrib/hc-build
index a907478..f52f29c 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,24 @@ 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 library..."
-echo "GhcWithHscBuiltViaC=NO" >>mk/build.mk
-$MAKE -C ghc/lib clean boot all			|| exit 1
-$MAKE -C hslibs  clean boot all
+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
+
+# 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