about summary refs log tree commit diff
path: root/compiler/rustc_feature/src
diff options
context:
space:
mode:
authorStuart Cook <Zalathar@users.noreply.github.com>2024-09-14 20:22:41 +1000
committerGitHub <noreply@github.com>2024-09-14 20:22:41 +1000
commit73f684f3c5421cf328c8e0eea74bc316e6c3c21c (patch)
treedf16f7da23839963849357c221c9f24826fcee62 /compiler/rustc_feature/src
parent517e7ce37f3d5acae0eaa7e50bc76c291fb91e59 (diff)
parent56844c797ad65f25e1696bac966743fc47b9beb2 (diff)
downloadrust-73f684f3c5421cf328c8e0eea74bc316e6c3c21c.tar.gz
rust-73f684f3c5421cf328c8e0eea74bc316e6c3c21c.zip
Rollup merge of #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 https://github.com/rust-lang/rust/pull/77202 and in https://github.com/rust-lang/rust/pull/100286.

Fixes part of https://github.com/rust-lang/rust/issues/80817 (linking with `-Clinker=ld` now works), though more work is still needed in this area, see also https://github.com/rust-lang/rust/issues/129432.

``@rustbot`` label O-macos A-cross
Diffstat (limited to 'compiler/rustc_feature/src')
0 files changed, 0 insertions, 0 deletions