From: dons <unknown>
Date: Wed, 6 Oct 2004 00:56:59 +0000 (+0000)
Subject: [project @ 2004-10-06 00:56:59 by dons]
X-Git-Tag: Initial_conversion_from_CVS_complete~1529
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=10aa0194ea4a6b7de6efbbb489787a7846542b2d

[project @ 2004-10-06 00:56:59 by dons]
Use >> append onto build.mk, so that build scripts can add extra vars
to build.mk.

Replace grep \(a\|b\) with [ab]. \| is an extended regex, whereas the
[] class is a basic RE -- so it works with BSD grep.
---

diff --git a/distrib/hc-build b/distrib/hc-build
index 367cfd6..606badf 100644
--- a/distrib/hc-build
+++ b/distrib/hc-build
@@ -28,7 +28,7 @@ fi
 #
 case "$configopts" in
 *--enable-hc-boot-unregisterised*)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
 GhcWithInterpreter=NO
 GhcWithNativeCodeGen=NO
 SplitObjs=NO
@@ -37,7 +37,7 @@ END
 ;;
 
 *)
-cat >mk/build.mk <<END
+cat >>mk/build.mk <<END
 # empty
 END
 ;;
@@ -77,7 +77,7 @@ PRIMOP_BITS="primop-data-decl.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
+find libraries hslibs | grep '\.[oa]$' | xargs rm -f
 
 # Do includes and RTS now
 $MAKE -C ghc/includes boot && $MAKE -C ghc/includes all