X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fhc-build;h=f0ad9dc5449c4861063b9d165cbdadc4adcab069;hb=21a542ddc3d02e0d3a8be28e0aa00796970adb9e;hp=6fb9f8687a7025bf587ed20d261e1f4a84ef9646;hpb=4b7199131876dc3af72612a84348b0c03c7849a5;p=ghc-hetmet.git

diff --git a/distrib/hc-build b/distrib/hc-build
index 6fb9f86..f0ad9dc 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -1,6 +1,7 @@
-#/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
@@ -9,13 +10,22 @@
 
 configopts="$*"
 
+# check for GNU make
+#
+MAKENAMES="gmake make no-make"
+for make in $MAKENAMES; do
+  MAKE=$make
+  $make --version 2>&1 | grep "GNU Make" >/dev/null && break
+done
+if [ $MAKE = no-make ]; then
+  echo "Fatal error: Cannot find the GNU make utility"
+  exit 1
+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
@@ -23,12 +33,20 @@ 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 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
 
-echo "*** Building library..."
-echo "GhcWithHscBuiltViaC=NO" >>mk/build.mk
-make -C ghc/lib clean boot all			|| exit 1
-make -C hslibs  clean boot all
+$MAKE -C hslibs    clean boot all
+$MAKE -C ghc/utils clean boot all