Commit a1e15498 authored by Adam Norberg's avatar Adam Norberg Committed by LUCI CQ

Xcode 12b3 (and later) emits arm64e binaries; try that architecture.

In Xcode 12 beta 3, pointer authentication was turned on for ARM64
binaries, yielding arm64e architecture. Attempting to run with only
arm64 specified does not allow an arm64e slice to run. Prefer arm64e
if available, but allow an arm64 slice if that's the only option.
(If provided multiple architectures, arch uses the first one that can
be used.)

Bug: 1103236
Change-Id: Id3498816a2495a449a16b3b6a66b0e776b70f4e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2404709Reviewed-by: 's avatarDirk Pranke <dpranke@google.com>
Reviewed-by: 's avatarMark Mentovai <mark@chromium.org>
Commit-Queue: Adam Norberg <norberg@google.com>
parent 53ffef8f
......@@ -1407,7 +1407,7 @@ class GitWrapper(SCMWrapper):
# the native ARM slice instead of the Intel slice.
# TODO(thakis): Remove this again once we ship an arm64 python3
# binary.
cmd = ['arch', '-arch', 'arm64'] + cmd
cmd = ['arch', '-arch', 'arm64e', '-arch', 'arm64'] + cmd
gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment