Merge branch 'release/6.0.1xx' into release/6.0.3xx

This commit is contained in:
Jason Zhai 2022-11-13 18:24:28 -08:00
commit 7be65d9599

View file

@ -52,7 +52,7 @@ done
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
cpuname=$(uname -m) cpuname=$(uname -m)
case $cpuname in case $cpuname in
aarch64) arm64|aarch64)
buildarch=arm64 buildarch=arm64
;; ;;
amd64|x86_64) amd64|x86_64)
@ -61,7 +61,7 @@ case $cpuname in
armv*l) armv*l)
buildarch=arm buildarch=arm
;; ;;
i686) i[3-6]86)
buildarch=x86 buildarch=x86
;; ;;
*) *)