From 26f32af5a0d3f287b80dbad98fc1e85f16a5886c Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 9 Oct 2023 18:41:40 -0700 Subject: [PATCH 1/4] Use mac arm64 clang in m1 machines. This will use clang arm64 in builds running on mac m1 machines for builds that are not using goma. Bug: https://github.com/flutter/flutter/issues/136219 --- tools/gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/gn b/tools/gn index 196219d35d611..7337c0aecafaa 100755 --- a/tools/gn +++ b/tools/gn @@ -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) @@ -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 From 99bf1ec65c5e8efe06d2f2e103d730f5a4cc7c04 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 9 Oct 2023 19:33:14 -0700 Subject: [PATCH 2/4] Build ios_release on x64. --- ci/builders/mac_ios_engine.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 600f495929b0c..a762ed936cc50 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -96,7 +96,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x64" ], "gn": [ "--ios", From ad8a0191106c308a11956589b2cbd1216febdd6b Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 9 Oct 2023 20:38:45 -0700 Subject: [PATCH 3/4] Use correct dimension for x64. --- ci/builders/mac_ios_engine.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index a762ed936cc50..d1250d3cb17d9 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -97,7 +97,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x64" + "cpu=x86-64" ], "gn": [ "--ios", From 5661ad6ea7e6be8866b7cd5edb203ca790a5a77d Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 9 Oct 2023 21:24:20 -0700 Subject: [PATCH 4/4] Build ios-debug on x64. --- ci/builders/mac_ios_engine.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index d1250d3cb17d9..2773184435b03 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -49,7 +49,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=x86-64" ], "gn": [ "--ios",