Merged
Conversation
Collaborator
rustbot
added
S-waiting-on-review
jieyouxu
approved these changes
Sep 14, 2024
Member
jieyouxu
left a comment
jieyouxu
left a comment
There was a problem hiding this comment.
Thanks, this seems reasonable, though I imagine we would want to mention this in relnotes.
jieyouxu
added
the
relnotes
3 tasks
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
Contributor
Author
We might not want to do that before it's also fixed when linking with the default linker |
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Sep 14, 2024
…eyouxu Fix `SDKROOT` ignore on macOS `rustc` has code to detect when `SDKROOT` is obviously set for the wrong platform, so that it can choose to ignore it. This is a pretty important feature for Cargo build scripts and proc macros, since you will often have `SDKROOT` set to an iOS platform there. However, the code was checking for an old SDK version name `"macosx10.15"` that was previously configured by `add_apple_sdk`, but nowadays configured to the correct `"macosx"`. I think this error was introduced in part rust-lang#77202 and in rust-lang#100286. Fixes part of rust-lang#80817 (linking with `-Clinker=ld` now works), though more work is still needed in this area, see also rust-lang#129432. `@rustbot` label O-macos A-cross
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
Rollup of 3 pull requests Successful merges: - rust-lang#130053 (fix doc comments for Peekable::next_if(_eq)) - rust-lang#130268 (simd_shuffle: require index argument to be a vector) - rust-lang#130334 (Fix `SDKROOT` ignore on macOS) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
Rollup of 4 pull requests Successful merges: - rust-lang#130053 (fix doc comments for Peekable::next_if(_eq)) - rust-lang#130267 (small_data_threshold.rs: Adapt to LLVM head changes) - rust-lang#130311 ((fix) conflicting negative impl marker) - rust-lang#130334 (Fix `SDKROOT` ignore on macOS) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
Rollup merge of rust-lang#130334 - madsmtm:macos-sdkroot-ignore, r=jieyouxu Fix `SDKROOT` ignore on macOS `rustc` has code to detect when `SDKROOT` is obviously set for the wrong platform, so that it can choose to ignore it. This is a pretty important feature for Cargo build scripts and proc macros, since you will often have `SDKROOT` set to an iOS platform there. However, the code was checking for an old SDK version name `"macosx10.15"` that was previously configured by `add_apple_sdk`, but nowadays configured to the correct `"macosx"`. I think this error was introduced in part rust-lang#77202 and in rust-lang#100286. Fixes part of rust-lang#80817 (linking with `-Clinker=ld` now works), though more work is still needed in this area, see also rust-lang#129432. ``@rustbot`` label O-macos A-cross
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
5 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.
rustchas code to detect whenSDKROOTis obviously set for the wrong platform, so that it can choose to ignore it. This is a pretty important feature for Cargo build scripts and proc macros, since you will often haveSDKROOTset to an iOS platform there.However, the code was checking for an old SDK version name
"macosx10.15"that was previously configured byadd_apple_sdk, but nowadays configured to the correct"macosx". I think this error was introduced in part #77202 and in #100286.Fixes part of #80817 (linking with
-Clinker=ldnow works), though more work is still needed in this area, see also #129432.@rustbot label O-macos A-cross