Also revert -- these parens were there for a reason. :-(

* config.guess: Remove unnecessary parentheses inside `..`
	command substitutions to improve clarity.
This commit is contained in:
Ben Elliston 2017-11-05 11:33:30 +11:00
parent 76d2f0e6f6
commit ef95b1db9b
2 changed files with 29 additions and 22 deletions

View File

@ -1,3 +1,10 @@
2017-11-05 Ben Elliston <bje@gnu.org>
Also revert -- these parens were there for a reason. :-(
* config.guess: Remove unnecessary parentheses inside `..` command
substitutions to improve clarity.
2017-11-04 Ben Elliston <bje@gnu.org> 2017-11-04 Ben Elliston <bje@gnu.org>
Revert -- it's too soon to make this change. Revert -- it's too soon to make this change.

44
config.guess vendored
View File

@ -127,10 +127,10 @@ if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
PATH=$PATH:/.attbin ; export PATH PATH=$PATH:/.attbin ; export PATH
fi fi
UNAME_MACHINE=`uname -m 2>/dev/null` || UNAME_MACHINE=unknown UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`uname -r 2>/dev/null` || UNAME_RELEASE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`uname -s 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`uname -v 2>/dev/null` || UNAME_VERSION=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_SYSTEM}" in case "${UNAME_SYSTEM}" in
Linux|GNU|GNU/*) Linux|GNU|GNU/*)
@ -168,10 +168,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor # Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown". # portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch" sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`uname -p 2>/dev/null || \ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
/sbin/$sysctl 2>/dev/null || \ /sbin/$sysctl 2>/dev/null || \
/usr/sbin/$sysctl 2>/dev/null || \ /usr/sbin/$sysctl 2>/dev/null || \
echo unknown` echo unknown)`
case "${UNAME_MACHINE_ARCH}" in case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;; armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;; arm*) machine=arm-unknown ;;
@ -347,7 +347,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;; exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`/bin/universe 2>/dev/null`" = att ; then if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3 echo pyramid-pyramid-sysv3
else else
echo pyramid-pyramid-bsd echo pyramid-pyramid-bsd
@ -1094,7 +1094,7 @@ EOF
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`/bin/uname -X|grep Release|sed -e 's/.*= //'` UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586 && UNAME_MACHINE=i586
@ -1188,7 +1188,7 @@ EOF
exit ;; exit ;;
*:SINIX-*:*:*) *:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`uname -p 2>/dev/null` UNAME_MACHINE=`(uname -p) 2>/dev/null`
echo ${UNAME_MACHINE}-sni-sysv4 echo ${UNAME_MACHINE}-sni-sysv4
else else
echo ns32k-sni-sysv echo ns32k-sni-sysv
@ -1374,7 +1374,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;; exit ;;
*:*VMS:*:*) *:*VMS:*:*)
UNAME_MACHINE=`uname -p 2>/dev/null` UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;; A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;;
@ -1429,20 +1429,20 @@ provide the necessary information to handle your system.
config.guess timestamp = $timestamp config.guess timestamp = $timestamp
uname -m = `uname -m 2>/dev/null || echo unknown` uname -m = `(uname -m) 2>/dev/null || echo unknown`
uname -r = `uname -r 2>/dev/null || echo unknown` uname -r = `(uname -r) 2>/dev/null || echo unknown`
uname -s = `uname -s 2>/dev/null || echo unknown` uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `uname -v 2>/dev/null || echo unknown` uname -v = `(uname -v) 2>/dev/null || echo unknown`
/usr/bin/uname -p = `/usr/bin/uname -p 2>/dev/null` /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
/bin/uname -X = `/bin/uname -X 2>/dev/null` /bin/uname -X = `(/bin/uname -X) 2>/dev/null`
hostinfo = `hostinfo 2>/dev/null` hostinfo = `(hostinfo) 2>/dev/null`
/bin/universe = `/bin/universe 2>/dev/null` /bin/universe = `(/bin/universe) 2>/dev/null`
/usr/bin/arch -k = `/usr/bin/arch -k 2>/dev/null` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
/bin/arch = `/bin/arch 2>/dev/null` /bin/arch = `(/bin/arch) 2>/dev/null`
/usr/bin/oslevel = `/usr/bin/oslevel 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `/usr/convex/getsysinfo 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
UNAME_MACHINE = ${UNAME_MACHINE} UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE} UNAME_RELEASE = ${UNAME_RELEASE}