diff options
| author | sjg <sjg@FreeBSD.org> | 2015-12-08 01:29:07 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-12-08 01:29:07 +0000 |
| commit | f25d8749d49c2dac52891bc0b98559f77826a558 (patch) | |
| tree | 318e0c200a044475b5d659b07c75b7cdd77b14e1 /contrib/bmake/boot-strap | |
| parent | 26eb4f225d52c3489b3178b0095927b181f82178 (diff) | |
| download | FreeBSD-src-f25d8749d49c2dac52891bc0b98559f77826a558.zip FreeBSD-src-f25d8749d49c2dac52891bc0b98559f77826a558.tar.gz | |
Merge bmake-20151201
Diffstat (limited to 'contrib/bmake/boot-strap')
| -rwxr-xr-x | contrib/bmake/boot-strap | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/bmake/boot-strap b/contrib/bmake/boot-strap index 340c46a..a49ffb1 100755 --- a/contrib/bmake/boot-strap +++ b/contrib/bmake/boot-strap @@ -111,7 +111,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $ +# $Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -395,8 +395,15 @@ 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=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'` +TOOL_DIFF=`which diff` export TOOL_DIFF op_configure() { |
