Revert "[cipd] Detect Mac ARM running under Rosetta"

This reverts commit e121d14b12.

Reason for revert: git for mac arm is widely available now so
this hack is no longer needed. See: b/228226478

Original change's description:
> [cipd] Detect Mac ARM running under Rosetta
>
> If a user has git for x64, `git cl` results in downloading x64 cipd
> packages. Other operations, such as gclient or git-cl will result in
> downloading arm64. This flip-flopping between architectures causes
> unexpected behavior:
> (1) slows down commands since packages are wiped and new ones are
> downloaded.
> (2) long running processes, such as goma may crash.
>
> This change adds additional check for all macs running on x86 to check
> if is running under Rosetta and sets ARCH=arm64 if true.
>
> R=bryner@google.com, masonf@chromium.org
>
> Bug: 1311733
> Change-Id: I65b127467d5c47d5bf07952d2ecdcb93630c7c87
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3573068
> Reviewed-by: Brian Ryner <bryner@google.com>
> Reviewed-by: Mason Freed <masonf@chromium.org>
> Commit-Queue: Josip Sokcevic <sokcevic@google.com>

Bug: 1311733
Bug: b/228226478
Change-Id: I3888769944d7fe200a0bff8cf0a1c04407d50bdf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4763444
Reviewed-by: Jonathan Nieder <jrn@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
changes/44/4763444/3
Josip Sokcevic 2 years ago committed by LUCI CQ
parent be8033c7e1
commit d6f65bfa32

@ -44,19 +44,11 @@ case "${UNAME}" in
exit 1 exit 1
esac esac
if [ -z $ARCH ]; then if [ -z $ARCH ]; then
UNAME=`uname -m | tr '[:upper:]' '[:lower:]'` UNAME=`uname -m | tr '[:upper:]' '[:lower:]'`
case "${UNAME}" in case "${UNAME}" in
x86_64|amd64) x86_64|amd64)
ARCH=amd64 ARCH=amd64
# Check if Mac ARM running under Rosetta
if [ $OS == 'mac' ]; then
TRANSLATED=`/usr/sbin/sysctl -n sysctl.proc_translated 2> /dev/null || echo 0`
if [ $TRANSLATED == "1" ]; then
ARCH="arm64"
fi
fi
;; ;;
s390x|ppc64|ppc64le) # best-effort support s390x|ppc64|ppc64le) # best-effort support
ARCH="${UNAME}" ARCH="${UNAME}"

Loading…
Cancel
Save