Commit 3aaa5c4d authored by Mark Mentovai's avatar Mark Mentovai Committed by Commit Bot

mac: Update toolchain to Xcode 12.2 (12B45b)

This version of Xcode updates the macOS SDK to 11.0 20A2408 (closer to
11.0 than 11.0.1).

Bug: 1108831
Change-Id: I9fe09af1d325e0e68e7351fe7f92ce84e676c922
CQ-Include-Trybots: luci.chromium.try:mac-arm64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537573
Commit-Queue: Mark Mentovai <mark@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827292}
parent 117ce264
...@@ -29,11 +29,10 @@ import shutil ...@@ -29,11 +29,10 @@ import shutil
import subprocess import subprocess
import sys import sys
# This contains binaries from the Xcode 12.2 release candidate, along with the # This contains binaries from Xcode 12.2 12B45b, along with the macOS 11 SDK.
# macOS 11 SDK (aka 12B5044c). To build these packages, see comments in # To build these packages, see comments in build/xcode_binaries.yaml
# build/xcode_binaries.yaml
MAC_BINARIES_LABEL = 'infra_internal/ios/xcode/xcode_binaries/mac-amd64' MAC_BINARIES_LABEL = 'infra_internal/ios/xcode/xcode_binaries/mac-amd64'
MAC_BINARIES_TAG = 'UwKVijd1FvMzmCAjyoYq_sw6xXJZpw_mGBH420gwlrwC' MAC_BINARIES_TAG = 'Uez8drOxhQfCBsViLtHwcbwmi3VzShwUKE_WyBI4lzEC'
# The toolchain will not be downloaded if the minimum OS version is not met. 19 # The toolchain will not be downloaded if the minimum OS version is not met. 19
# is the major version number for macOS 10.15. 12B5044c (Xcode 12.2rc) only runs # is the major version number for macOS 10.15. 12B5044c (Xcode 12.2rc) only runs
......
...@@ -15,11 +15,10 @@ that continuously runs tests. Most tests pass. ...@@ -15,11 +15,10 @@ that continuously runs tests. Most tests pass.
You can build Chrome for arm macs on an Intel Mac. To build for arm64, you have You can build Chrome for arm macs on an Intel Mac. To build for arm64, you have
to do 2 things: to do 2 things:
1. use the `MacOSX11.0.sdk` that comes with the 1. use the `MacOSX11.0.sdk` that comes with Xcode 12.2. If you're on Google's
Xcode 12.2 release candidate. If you're on Google's corporate network, this corporate network, this SDK is part of the hermetic toolchain and will be
SDK is part of the hermetic toolchain and will be used automatically. used automatically. Otherwise, manually download and install this version of
Otherwise, manually download and install this version of Xcode and make it Xcode and, if necessary, make it the active Xcode with `xcode-select`.
the active Xcode with `xcode-select`.
2. Add `target_cpu = "arm64"` to your `args.gn`. 2. Add `target_cpu = "arm64"` to your `args.gn`.
......
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