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

Use the x64 toolchain when building host artifacts on arm64 mac - #39279

Merged
zanderso merged 1 commit into
flutter-team-archive:mainfrom
zanderso:mac-host-cpu-x64
Feb 1, 2023
Merged

zanderso merged 1 commit into
flutter-team-archive:mainfrom
zanderso:mac-host-cpu-x64

Conversation

@zanderso

Copy link
Copy Markdown
Contributor

This is needed to use arm64 macs in CI, and for the reasons noted in the comment.

@zanderso

Copy link
Copy Markdown
Contributor Author

cc @godofredoc

@zanderso
zanderso requested review from cbracken and jmagman January 31, 2023 15:28

@jmagman jmagman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM in theory, @cbracken should have the deciding review though.

Comment thread tools/gn
# for macOS (see the logic below), pass the flag "--mac-cpu arm64".
# https://github.com/flutter/flutter/issues/103386 is also relevant here.
if get_host_os() == 'mac' and not args.mac_cpu == 'arm64':
gn_args['host_cpu'] = 'x64'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't I already covered this for host builds in lines 356-360?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I simplified the logic, and with the simpler logic, hopefully the comment makes more sense now. PTAL.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks!

@cbracken cbracken left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM stamp from a Japanese personal seal

@zanderso
zanderso merged commit 0de70db into flutter-team-archive:main Feb 1, 2023
@zanderso
zanderso deleted the mac-host-cpu-x64 branch February 1, 2023 15:41
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2023
auto-submit Bot pushed a commit to flutter/flutter that referenced this pull request Feb 1, 2023
* 30ba71e Roll Skia from 8f33da33edcf to 4b5799677173 (1 revision) (flutter-team-archive/engine#39318)

* 0de70db Use the x64 toolchain when building host artifacts on arm64 mac (flutter-team-archive/engine#39279)

* 4fc0a02 Update README.md (flutter-team-archive/engine#39319)

* bae3774 Roll Skia from 4b5799677173 to 86f7b2dd2b4f (8 revisions) (flutter-team-archive/engine#39320)

* ba3adb7 Roll Dart SDK from 88d1f3ffa266 to b47964e5d575 (1 revision) (flutter-team-archive/engine#39321)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants