GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crossgcc/buildgcc: update file location code 

- Change from 'which' to 'command -v'. 'which' is not a posix command.

Change-Id: Icdf18e7e496447157554b8e61b1528f03456536d
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20230
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Martin Roth 2017-06-15 11:37:26 -06:00 committed by Nico Huber
parent 72dc21cb7c
commit d55f5ebe44
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/crossgcc/buildgcc
View File

@ -152,7 +152,7 @@ searchtool()
search="$2" search="$2"
fi fi
for i in "$1" "g$1" "gnu$1"; do for i in "$1" "g$1" "gnu$1"; do
if [ -x "$(which $i 2>/dev/null)" ]; then if [ -x "$(command -v $i 2>/dev/null)" ]; then
if [ "$(cat /dev/null | $i --version 2>&1 | grep -c "$search")" \ if [ "$(cat /dev/null | $i --version 2>&1 | grep -c "$search")" \
-gt 0 ]; then -gt 0 ]; then
echo $i echo $i
@ -164,7 +164,7 @@ searchtool()
# patch and tar also work. # patch and tar also work.
if [ $UNAME = "Darwin" -o $UNAME = "FreeBSD" -o $UNAME = "NetBSD" -o $UNAME = "OpenBSD" ]; then if [ $UNAME = "Darwin" -o $UNAME = "FreeBSD" -o $UNAME = "NetBSD" -o $UNAME = "OpenBSD" ]; then
if [ "$1" = "patch" -o "$1" = "tar" ]; then if [ "$1" = "patch" -o "$1" = "tar" ]; then
if [ -x "$(which $1 2>/dev/null)" ]; then if [ -x "$(command -v $1 2>/dev/null)" ]; then
echo $1 echo $1
return return
fi fi
@ -172,19 +172,19 @@ searchtool()
fi fi
if echo $1 | grep -q "sum" ; then if echo $1 | grep -q "sum" ; then
algor=$(echo $1 | sed -e 's,sum,,') algor=$(echo $1 | sed -e 's,sum,,')
if [ -x "$(which $1 2>/dev/null)" ]; then if [ -x "$(command -v $1 2>/dev/null)" ]; then
#xxxsum [file] #xxxsum [file]
echo $1 echo $1
return return
elif [ -x "$(which $algor 2>/dev/null)" ]; then elif [ -x "$(command -v $algor 2>/dev/null)" ]; then
#xxx [file] #xxx [file]
echo $algor echo $algor
return return
elif [ -x "$(which openssl 2>/dev/null)" ]; then elif [ -x "$(command -v openssl 2>/dev/null)" ]; then
#openssl xxx [file] #openssl xxx [file]
echo openssl $algor echo openssl $algor
return return
elif [ -x "$(which cksum 2>/dev/null)" ]; then elif [ -x "$(command -v cksum 2>/dev/null)" ]; then
#cksum -a xxx [file] #cksum -a xxx [file]
#cksum has special options in NetBSD. Actually, NetBSD will use the second case above. #cksum has special options in NetBSD. Actually, NetBSD will use the second case above.
echo "buildgcc" | cksum -a $algor > /dev/null 2>/dev/null && \ echo "buildgcc" | cksum -a $algor > /dev/null 2>/dev/null && \