-
Notifications
You must be signed in to change notification settings - Fork 6k
Use the x64 toolchain when building host artifacts on arm64 mac #39279
Conversation
|
cc @godofredoc |
jmagman
left a comment
There was a problem hiding this comment.
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.
| # 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' |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Thanks!
7b1915a to
2af0dea
Compare
cbracken
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…119741) * 30ba71efa Roll Skia from 8f33da33edcf to 4b5799677173 (1 revision) (flutter/engine#39318) * 0de70dbe5 Use the x64 toolchain when building host artifacts on arm64 mac (flutter/engine#39279) * 4fc0a0297 Update README.md (flutter/engine#39319) * bae377499 Roll Skia from 4b5799677173 to 86f7b2dd2b4f (8 revisions) (flutter/engine#39320) * ba3adb74d Roll Dart SDK from 88d1f3ffa266 to b47964e5d575 (1 revision) (flutter/engine#39321)

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