Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIssam E. Maghni <issam.e.maghni@mailbox.org>2021-05-19 06:15:53 +0300
committerJames M Snell <jasnell@gmail.com>2021-05-22 01:47:16 +0300
commit7afa7b9ab34b4f7c7ddf113e5c9e9b4ff6c60915 (patch)
tree2ccc1346b3ba1aaf57c51a5f90e806f50ebabda5 /android-configure
parenta1f590ebd609c72587fc9adda43c1b530e15bf11 (diff)
build: replace non-POSIX test -a|o
test/[ from sbase unix tools[1] throws "too many arguments" if -a or -o is provided. The syntax has been marked obsolescent as per the manual[2]. [1] http://core.suckless.org/sbase/ [2] https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16 PR-URL: https://github.com/nodejs/node/pull/38731 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'android-configure')
-rwxr-xr-xandroid-configure2
1 files changed, 1 insertions, 1 deletions
diff --git a/android-configure b/android-configure
index ecb13f399e4..43341d1abea 100755
--- a/android-configure
+++ b/android-configure
@@ -56,7 +56,7 @@ export CXX_host=$(command -v g++)
host_gcc_version=$($CC_host --version | grep gcc | awk '{print $NF}')
major=$(echo $host_gcc_version | awk -F . '{print $1}')
minor=$(echo $host_gcc_version | awk -F . '{print $2}')
-if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || [ $major -eq 6 -a $minor -lt 3 ]; then
+if [ -z $major ] || [ -z $minor ] || [ $major -lt 6 ] || ( [ $major -eq 6 ] && [ $minor -lt 3 ] ); then
echo "host gcc $host_gcc_version is too old, need gcc 6.3.0"
return 1
fi