-
Notifications
You must be signed in to change notification settings - Fork 29.1k
macOS,iOS: fix swift target triple #168749
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
While unifying iOS and macOS gn configuration in flutter#168517, I failed to correctly merge the deployment target in the target triple, resulting in it being incorrectly hardcoded to the macOS deployment target. This corrects this to the correct value for the `target_os` of the current compile. Also gets rid of an unnecessary assertion; we already `assert(is_mac || is_ios)` at the top of the file. Issue: flutter#167592
9f1e924
to
6e94201
Compare
} | ||
_target_triplet = "$_triplet_cpu-$_triplet_os$mac_deployment_target$_triplet_environment" | ||
_target_triplet = "$_triplet_cpu-$_triplet_os$_deployment_target$_triplet_environment" |
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.
sanity check: there's a -
between cpu & os, but not other places?
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.
See line 45 above; there's a -
between apple-ios
and simulator
if it's a simulator build. So the full "triplet" is arm64-apple-ios-simulator
in that case. Otherwise it's just arm64-apple-ios
.
Triplet is a loosely defined historical term that compilers use for this. https://wiki.osdev.org/Target_Triplet
The standard form is "architecture-vendor-os" but for simulator builds, Apple uses ios-simulator
for the OS bit. Target triplets in general are a massive mess with tons of historical baggage and lots of exceptions. I mean the more accurate architecture name is aarch64
not arm64
, but Apple's gonna Apple.
flutter/flutter@0b9f928...9a78af5 2025-05-15 bkonyi@google.com Manual pub package roll (flutter/flutter#168916) 2025-05-15 matanlurey@users.noreply.github.com Remove unnecessary `bringup: true` for release-channel only `Linux flutter_packaging`. (flutter/flutter#168761) 2025-05-15 matanlurey@users.noreply.github.com Revert: "Run `flutter_packaging` builders on release candidates (flutter/flutter#168917) 2025-05-15 engine-flutter-autoroll@skia.org Roll Dart SDK from a6c25e31caa7 to c9640c3a4440 (1 revision) (flutter/flutter#168911) 2025-05-15 engine-flutter-autoroll@skia.org Roll Packages from 1468581 to 2dff621 (4 revisions) (flutter/flutter#168908) 2025-05-15 engine-flutter-autoroll@skia.org Roll Dart SDK from b3520981e0f0 to a6c25e31caa7 (11 revisions) (flutter/flutter#168895) 2025-05-15 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from fSvuEJgRmHxnewRJr... to Jj-iDG5uPOsFgY2_H... (flutter/flutter#168893) 2025-05-15 jsimionato@google.com Fix mac_ios_engine_ddm config with missing ci/ios_debug_sim_ddm config (flutter/flutter#168888) 2025-05-15 dacoharkes@google.com [native assets] Remove `KernelSnapshot` dependency in build (flutter/flutter#168742) 2025-05-15 chris@bracken.jp iOS,macOS: Migrate logging to Logger/FlutterLogger (flutter/flutter#168568) 2025-05-15 58529443+srujzs@users.noreply.github.com Skip hot reload breakpoints test when running with web (flutter/flutter#168873) 2025-05-15 victorsanniay@gmail.com CupertinoSliverNavigationBar respects accessibility text scaling (flutter/flutter#168866) 2025-05-15 jonahwilliams@google.com [display_list] paint cleanup. (flutter/flutter#168082) 2025-05-15 jsimionato@google.com Add a new CI build for iOS DDM-enabled artifacts (flutter/flutter#168717) 2025-05-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Implements UISceneDelegate dynamically w/ FlutterLaunchEngine (#168396)" (flutter/flutter#168880) 2025-05-14 30870216+gaaclarke@users.noreply.github.com Implements UISceneDelegate dynamically w/ FlutterLaunchEngine (flutter/flutter#168396) 2025-05-14 matanlurey@users.noreply.github.com Mark web_tool_tests_1_2 as bringup. (flutter/flutter#168871) 2025-05-14 fluttergithubbot@gmail.com Marks Mac_mokey run_debug_test_android to be unflaky (flutter/flutter#167634) 2025-05-14 victorsanniay@gmail.com Reland "Clip search artifacts in CupertinoSliverNavigationBar searchable-to-searchable transitions" (flutter/flutter#168772) 2025-05-14 matanlurey@users.noreply.github.com Remove references to `team-release`. (flutter/flutter#168780) 2025-05-14 58190796+MitchellGoodwin@users.noreply.github.com Make Cupertino sheet set the systemUIStyle through an AnnotatedRegion (flutter/flutter#168182) 2025-05-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Use live region in error text input decorator for Android (#165531)" (flutter/flutter#168848) 2025-05-14 huy@nevercode.io Normalize BottomAppBarTheme (flutter/flutter#168586) 2025-05-14 engine-flutter-autoroll@skia.org Roll Packages from 2e166de to 1468581 (2 revisions) (flutter/flutter#168828) 2025-05-14 chris@bracken.jp macOS,iOS: fix swift target triple (flutter/flutter#168749) 2025-05-14 matanlurey@users.noreply.github.com Further update `Engine-artifacts.md`. (flutter/flutter#168779) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
…r#9259) flutter/flutter@0b9f928...9a78af5 2025-05-15 bkonyi@google.com Manual pub package roll (flutter/flutter#168916) 2025-05-15 matanlurey@users.noreply.github.com Remove unnecessary `bringup: true` for release-channel only `Linux flutter_packaging`. (flutter/flutter#168761) 2025-05-15 matanlurey@users.noreply.github.com Revert: "Run `flutter_packaging` builders on release candidates (flutter/flutter#168917) 2025-05-15 engine-flutter-autoroll@skia.org Roll Dart SDK from a6c25e31caa7 to c9640c3a4440 (1 revision) (flutter/flutter#168911) 2025-05-15 engine-flutter-autoroll@skia.org Roll Packages from 1468581 to 2dff621 (4 revisions) (flutter/flutter#168908) 2025-05-15 engine-flutter-autoroll@skia.org Roll Dart SDK from b3520981e0f0 to a6c25e31caa7 (11 revisions) (flutter/flutter#168895) 2025-05-15 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from fSvuEJgRmHxnewRJr... to Jj-iDG5uPOsFgY2_H... (flutter/flutter#168893) 2025-05-15 jsimionato@google.com Fix mac_ios_engine_ddm config with missing ci/ios_debug_sim_ddm config (flutter/flutter#168888) 2025-05-15 dacoharkes@google.com [native assets] Remove `KernelSnapshot` dependency in build (flutter/flutter#168742) 2025-05-15 chris@bracken.jp iOS,macOS: Migrate logging to Logger/FlutterLogger (flutter/flutter#168568) 2025-05-15 58529443+srujzs@users.noreply.github.com Skip hot reload breakpoints test when running with web (flutter/flutter#168873) 2025-05-15 victorsanniay@gmail.com CupertinoSliverNavigationBar respects accessibility text scaling (flutter/flutter#168866) 2025-05-15 jonahwilliams@google.com [display_list] paint cleanup. (flutter/flutter#168082) 2025-05-15 jsimionato@google.com Add a new CI build for iOS DDM-enabled artifacts (flutter/flutter#168717) 2025-05-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Implements UISceneDelegate dynamically w/ FlutterLaunchEngine (#168396)" (flutter/flutter#168880) 2025-05-14 30870216+gaaclarke@users.noreply.github.com Implements UISceneDelegate dynamically w/ FlutterLaunchEngine (flutter/flutter#168396) 2025-05-14 matanlurey@users.noreply.github.com Mark web_tool_tests_1_2 as bringup. (flutter/flutter#168871) 2025-05-14 fluttergithubbot@gmail.com Marks Mac_mokey run_debug_test_android to be unflaky (flutter/flutter#167634) 2025-05-14 victorsanniay@gmail.com Reland "Clip search artifacts in CupertinoSliverNavigationBar searchable-to-searchable transitions" (flutter/flutter#168772) 2025-05-14 matanlurey@users.noreply.github.com Remove references to `team-release`. (flutter/flutter#168780) 2025-05-14 58190796+MitchellGoodwin@users.noreply.github.com Make Cupertino sheet set the systemUIStyle through an AnnotatedRegion (flutter/flutter#168182) 2025-05-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Use live region in error text input decorator for Android (#165531)" (flutter/flutter#168848) 2025-05-14 huy@nevercode.io Normalize BottomAppBarTheme (flutter/flutter#168586) 2025-05-14 engine-flutter-autoroll@skia.org Roll Packages from 2e166de to 1468581 (2 revisions) (flutter/flutter#168828) 2025-05-14 chris@bracken.jp macOS,iOS: fix swift target triple (flutter/flutter#168749) 2025-05-14 matanlurey@users.noreply.github.com Further update `Engine-artifacts.md`. (flutter/flutter#168779) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
…r#9259) flutter/flutter@0b9f928...9a78af5 2025-05-15 bkonyi@google.com Manual pub package roll (flutter/flutter#168916) 2025-05-15 matanlurey@users.noreply.github.com Remove unnecessary `bringup: true` for release-channel only `Linux flutter_packaging`. (flutter/flutter#168761) 2025-05-15 matanlurey@users.noreply.github.com Revert: "Run `flutter_packaging` builders on release candidates (flutter/flutter#168917) 2025-05-15 engine-flutter-autoroll@skia.org Roll Dart SDK from a6c25e31caa7 to c9640c3a4440 (1 revision) (flutter/flutter#168911) 2025-05-15 engine-flutter-autoroll@skia.org Roll Packages from 1468581 to 2dff621 (4 revisions) (flutter/flutter#168908) 2025-05-15 engine-flutter-autoroll@skia.org Roll Dart SDK from b3520981e0f0 to a6c25e31caa7 (11 revisions) (flutter/flutter#168895) 2025-05-15 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from fSvuEJgRmHxnewRJr... to Jj-iDG5uPOsFgY2_H... (flutter/flutter#168893) 2025-05-15 jsimionato@google.com Fix mac_ios_engine_ddm config with missing ci/ios_debug_sim_ddm config (flutter/flutter#168888) 2025-05-15 dacoharkes@google.com [native assets] Remove `KernelSnapshot` dependency in build (flutter/flutter#168742) 2025-05-15 chris@bracken.jp iOS,macOS: Migrate logging to Logger/FlutterLogger (flutter/flutter#168568) 2025-05-15 58529443+srujzs@users.noreply.github.com Skip hot reload breakpoints test when running with web (flutter/flutter#168873) 2025-05-15 victorsanniay@gmail.com CupertinoSliverNavigationBar respects accessibility text scaling (flutter/flutter#168866) 2025-05-15 jonahwilliams@google.com [display_list] paint cleanup. (flutter/flutter#168082) 2025-05-15 jsimionato@google.com Add a new CI build for iOS DDM-enabled artifacts (flutter/flutter#168717) 2025-05-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Implements UISceneDelegate dynamically w/ FlutterLaunchEngine (#168396)" (flutter/flutter#168880) 2025-05-14 30870216+gaaclarke@users.noreply.github.com Implements UISceneDelegate dynamically w/ FlutterLaunchEngine (flutter/flutter#168396) 2025-05-14 matanlurey@users.noreply.github.com Mark web_tool_tests_1_2 as bringup. (flutter/flutter#168871) 2025-05-14 fluttergithubbot@gmail.com Marks Mac_mokey run_debug_test_android to be unflaky (flutter/flutter#167634) 2025-05-14 victorsanniay@gmail.com Reland "Clip search artifacts in CupertinoSliverNavigationBar searchable-to-searchable transitions" (flutter/flutter#168772) 2025-05-14 matanlurey@users.noreply.github.com Remove references to `team-release`. (flutter/flutter#168780) 2025-05-14 58190796+MitchellGoodwin@users.noreply.github.com Make Cupertino sheet set the systemUIStyle through an AnnotatedRegion (flutter/flutter#168182) 2025-05-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Use live region in error text input decorator for Android (#165531)" (flutter/flutter#168848) 2025-05-14 huy@nevercode.io Normalize BottomAppBarTheme (flutter/flutter#168586) 2025-05-14 engine-flutter-autoroll@skia.org Roll Packages from 2e166de to 1468581 (2 revisions) (flutter/flutter#168828) 2025-05-14 chris@bracken.jp macOS,iOS: fix swift target triple (flutter/flutter#168749) 2025-05-14 matanlurey@users.noreply.github.com Further update `Engine-artifacts.md`. (flutter/flutter#168779) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
While unifying iOS and macOS gn configuration in #168517,
I failed to correctly merge the deployment target in the target triple,
resulting in it being incorrectly hardcoded to the macOS deployment
target. This corrects this to the correct value for the
target_os
ofthe current compile.
Also gets rid of an unnecessary assertion; we already
assert(is_mac || is_ios)
at the top of the file.Issue: #167592
Pre-launch Checklist
///
).If you need help, consider asking for advice on the #hackers-new channel on Discord.