Fix building for Mac Catalyst#1577
Merged
NobodyXu merged 1 commit intorust-lang:mainfrom Sep 28, 2025
Merged
Conversation
madsmtm
force-pushed
the
macabi
branch
3 times, most recently
from
5cfc46a to
87c0aa1
Compare
NobodyXu
reviewed
Sep 28, 2025
Contributor
NobodyXu
left a comment
NobodyXu
left a comment
There was a problem hiding this comment.
Thanks!
Can you run the "Test nightly rustc targets and add issue comment if changed" just to make sure there's no regression?
NobodyXu
reviewed
Sep 28, 2025
Contributor
Author
I ran the following locally, and that worked: RUSTFLAGS=--cfg=rustc_target_test cargo +nightly test --libI don't know how to trigger a workflow on a PR? |
NobodyXu
approved these changes
Sep 28, 2025
Contributor
NobodyXu
left a comment
NobodyXu
left a comment
There was a problem hiding this comment.
Thank you!
As oong as it can pass all tests, I'm be ok with it
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Without this change, we end up passing
aarch64-apple-ios26.0-macabimacabito the compiler, which is definitely wrong.The core change here is to handle this in
from_cargo_environment_variablesas well, the rest is just a cleanup now thattarget.envcontains the canonical value (andtarget.abi).See also the previous #1517 and #1534.
I really should've checked that this worked in
cc-rsbefore landing rust-lang/rust#139451, sorry about that!