Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Use mac arm64 clang in m1 machines. #46697

Closed
wants to merge 4 commits into from
Closed

Use mac arm64 clang in m1 machines. #46697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26f32af
Use mac arm64 clang in m1 machines.
godofredoc Oct 10, 2023
99bf1ec
Build ios_release on x64.
godofredoc Oct 10, 2023
ad8a019
Use correct dimension for x64.
godofredoc Oct 10, 2023
5661ad6
Build ios-debug on x64.
godofredoc Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ci/builders/mac_ios_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86-64"
],
"gn": [
"--ios",
Expand Down Expand Up @@ -96,7 +97,8 @@
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86-64"
],
"gn": [
"--ios",
Expand Down
4 changes: 1 addition & 3 deletions tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ def buildtools_dir():
host_cpu = get_host_cpu()
if host_os == 'win':
host_os = 'windows'
if host_os == 'mac' and host_cpu == 'arm64':
host_cpu = 'x64'
return '%s-%s' % (host_os, host_cpu)


Expand Down Expand Up @@ -456,7 +454,7 @@ def to_gn_args(args):
# must be x64 to target x64.
# TODO(cbracken): https://github.com/flutter/flutter/issues/103386
if get_host_os() == 'mac' and not args.force_mac_arm64:
gn_args['host_cpu'] = 'x64'
gn_args['host_cpu'] = get_host_cpu()

if is_host_build(args) and gn_args['host_os'] == 'mac':
# macOS unit tests include Vulkan headers which reference Metal types
Expand Down