configure: Fix compatibility with BSD sed used in MacOS

Change-Id: I72f26eed4cbb3996d0a92c4334fa2c63b973bc9b
This commit is contained in:
Christian Soffke 2025-12-07 14:30:41 +01:00 committed by Solomon Peachy
parent f05be27ae6
commit 95ab3e8b0e

8
tools/configure vendored
View file

@ -4729,7 +4729,7 @@ if [ -z "$arch" ]; then
arch="arm" arch="arm"
# cpp defines like "#define __ARM_ARCH 4" (where we want to extract the 4) # cpp defines like "#define __ARM_ARCH 4" (where we want to extract the 4)
arch_version="$(echo "$cpp_defines" | grep 'define __ARM_ARCH ' | sed -e 's,.* \([0-9]\).*,\1,')" arch_version="$(echo "$cpp_defines" | grep 'define __ARM_ARCH ' | sed -e 's,.* \([0-9]\).*,\1,')"
arch_profile="$(echo "$cpp_defines" | grep 'define __ARM_ARCH_PROFILE ' | sed -e 's,.* \([0-9]\+\)$,\1,')" arch_profile="$(echo "$cpp_defines" | grep 'define __ARM_ARCH_PROFILE ' | sed -e 's/.* \([0-9]\{1,\}\)$/\1/')"
if test "$gccnum" -ge "800"; then if test "$gccnum" -ge "800"; then
# GCC8+ can natively emit unified asm syntax # GCC8+ can natively emit unified asm syntax
GCCOPTS="$GCCOPTS -masm-syntax-unified" GCCOPTS="$GCCOPTS -masm-syntax-unified"
@ -4772,7 +4772,7 @@ if [ -z "$arch" ]; then
arch="arm64" arch="arm64"
# cpp defines like "#define __ARM_ARCH 8" (where we want to extract the 8) # cpp defines like "#define __ARM_ARCH 8" (where we want to extract the 8)
arch_version="$(echo "$cpp_defines" | grep 'define __ARM_ARCH ' | sed -e 's,.* \([0-9]\).*,\1,')" arch_version="$(echo "$cpp_defines" | grep 'define __ARM_ARCH ' | sed -e 's,.* \([0-9]\).*,\1,')"
arch_profile="$(echo "$cpp_defines" | grep 'define __ARM_ARCH_PROFILE ' | sed -e 's,.* \([0-9]\+\)$,\1,')" arch_profile="$(echo "$cpp_defines" | grep 'define __ARM_ARCH_PROFILE ' | sed -e 's/.* \([0-9]\{1,\}\)$/\1/')"
case "$arch_profile" in case "$arch_profile" in
65) # Cortex-A 65) # Cortex-A
arch_profile=application arch_profile=application
@ -4784,8 +4784,8 @@ if [ -z "$arch" ]; then
esac esac
elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then
arch="mips" arch="mips"
arch_version="$(echo "$cpp_defines" | grep 'define __mips ' | sed -e 's,.* \([0-9]\+\).*,\1,')" arch_version="$(echo "$cpp_defines" | grep 'define __mips ' | sed -e 's/.* \([0-9]\{1,\}\).*/\1/')"
# arch_revision="$(echo "$cpp_defines" | grep 'define __mips_isa_rev ' | sed -e 's,.* \([0-9]\+\).*,\1,')" # arch_revision="$(echo "$cpp_defines" | grep 'define __mips_isa_rev ' | sed -e 's/.* \([0-9]\{1,\}\).*/\1/')"
# if [ -n "$arch_revision" ] ; then # if [ -n "$arch_revision" ] ; then
# arch_version="${arch_version}r${arch_revision}" # arch_version="${arch_version}r${arch_revision}"
# fi # fi