diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2021-12-18 07:27:22 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2021-12-18 07:27:22 +0000 |
commit | 2935fe8237c83c1dcb113dd5335733263e68e6fd (patch) | |
tree | 7d376b040e90f88c687679910749d76ed68bc6b2 /boot-strap | |
parent | ee914ef902ae018bd4f67192832120f9bf05651f (diff) |
Import bmake-20211212vendor/NetBSD/bmake/20211212
Relevant changes see ChangeLog for details:
Add support for ${.SUFFIXES} as read-only variable.
Fix memory leak in cond.c
Punt on write errors - ENOSPC etc.
Lots of code refactoring, rework to reduce memory allocations.
More unit-tests.
Diffstat (limited to 'boot-strap')
-rwxr-xr-x | boot-strap | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/boot-strap b/boot-strap index d251649db670..40984edcbe62 100755 --- a/boot-strap +++ b/boot-strap @@ -119,7 +119,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.54 2020/11/13 21:47:25 sjg Exp $ +# $Id: boot-strap,v 1.57 2021/10/22 20:32:21 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -405,17 +405,6 @@ Bmake() { ) } -# there is actually a shell where type is not a builtin -# if type is missing, which(1) had better exists! -if (type cat) > /dev/null 2>&1; then -which() { - type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q' -} -fi -# make sure test below uses the same diff that configure did -TOOL_DIFF=`which diff` -export TOOL_DIFF - op_configure() { $srcdir/configure $CONFIGURE_ARGS || exit 1 } @@ -431,7 +420,7 @@ op_build() { op_test() { [ -x bmake ] || op_build - Bmake test || exit 1 + Bmake test "$@" || exit 1 } op_clean() { @@ -483,5 +472,5 @@ You may need the -r or -R option to more/less to view it correctly. EOM } -op_$op +op_$op "$@" exit 0 |