config.guess: automatic fixups after previous automated patch

This patch was generated using the following command:

  sed -i config.guess \
      -e '/="[^"]\+"\(-\|$\)/s/="\([^"([:space:])]\+\)"/=\1/' \
      -e '/="[^"]\+"[[:alnum:]]/s/="\$\([^([:space:])]\+\)"/=${\1}/' \
      -e \
'/\$(echo[^|]\+|/s/\([^[:space:]]\)[[:space:]]*|[[:space:]]*sed/\1 | sed/g'

* config.guess: Remove unneeded quotes in other variable assignments,
standardize spacing for "echo ... | sed" substitutions.
This commit is contained in:
Jacob Bachmeyer 2021-05-25 22:20:24 -05:00 committed by Dmitry V. Levin
parent 649a106360
commit b1e61adfaa

22
config.guess vendored
View File

@ -115,7 +115,7 @@ set_cc_for_build() {
,,) echo "int x;" > "$dummy.c" ,,) echo "int x;" > "$dummy.c"
for driver in cc gcc c89 c99 ; do for driver in cc gcc c89 c99 ; do
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$driver" CC_FOR_BUILD=$driver
break break
fi fi
done done
@ -205,9 +205,9 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
earmv*) earmv*)
arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,')
endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p')
machine="${arch}${endian}"-unknown machine=${arch}${endian}-unknown
;; ;;
*) machine="$UNAME_MACHINE_ARCH"-unknown ;; *) machine=$UNAME_MACHINE_ARCH-unknown ;;
esac esac
# The Operating System including object format, if it has switched # The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI. # to ELF recently (or will in the future) and ABI.
@ -608,7 +608,7 @@ EOF
if test -x /usr/bin/oslevel ; then if test -x /usr/bin/oslevel ; then
IBM_REV=$(/usr/bin/oslevel) IBM_REV=$(/usr/bin/oslevel)
else else
IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
fi fi
GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
;; ;;
@ -649,7 +649,7 @@ EOF
IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) awk -F: '{ print $3 }' | sed s/[0-9]*$/0/)
else else
IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
fi fi
GUESS=$IBM_ARCH-ibm-aix$IBM_REV GUESS=$IBM_ARCH-ibm-aix$IBM_REV
;; ;;
@ -675,7 +675,7 @@ EOF
GUESS=m68k-hp-bsd4.4 GUESS=m68k-hp-bsd4.4
;; ;;
9000/[34678]??:HP-UX:*:*) 9000/[34678]??:HP-UX:*:*)
HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') HPUX_REV=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//')
case $UNAME_MACHINE in case $UNAME_MACHINE in
9000/31?) HP_ARCH=m68000 ;; 9000/31?) HP_ARCH=m68000 ;;
9000/[34]??) HP_ARCH=m68k ;; 9000/[34]??) HP_ARCH=m68k ;;
@ -757,7 +757,7 @@ EOF
GUESS=$HP_ARCH-hp-hpux$HPUX_REV GUESS=$HP_ARCH-hp-hpux$HPUX_REV
;; ;;
ia64:HP-UX:*:*) ia64:HP-UX:*:*)
HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') HPUX_REV=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//')
GUESS=ia64-hp-hpux$HPUX_REV GUESS=ia64-hp-hpux$HPUX_REV
;; ;;
3050*:HI-UX:*:*) 3050*:HI-UX:*:*)
@ -943,11 +943,11 @@ EOF
;; ;;
*:GNU:*:*) *:GNU:*:*)
# the GNU system # the GNU system
GUESS="$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" GUESS="$(echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE" | sed -e 's,/.*$,,')"
;; ;;
*:GNU/*:*:*) *:GNU/*:*:*)
# other systems with GNU libc and userland # other systems with GNU libc and userland
GUESS="$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" GUESS="$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE" | sed -e 's/[-(].*//')-$LIBC"
;; ;;
*:Minix:*:*) *:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix GUESS=$UNAME_MACHINE-unknown-minix
@ -1139,7 +1139,7 @@ EOF
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_X32 >/dev/null grep IS_X32 >/dev/null
then then
LIBCABI="$LIBC"x32 LIBCABI=${LIBC}x32
fi fi
fi fi
GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
@ -1461,7 +1461,7 @@ EOF
if test "${cputype-}" = 386; then if test "${cputype-}" = 386; then
UNAME_MACHINE=i386 UNAME_MACHINE=i386
elif test "x${cputype-}" != x; then elif test "x${cputype-}" != x; then
UNAME_MACHINE="$cputype" UNAME_MACHINE=$cputype
fi fi
GUESS=$UNAME_MACHINE-unknown-plan9 GUESS=$UNAME_MACHINE-unknown-plan9
;; ;;