diff options
| author | bors <bors@rust-lang.org> | 2024-09-14 11:01:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-14 11:01:13 +0000 |
| commit | 02b1be16c65e5716ade771afde7116ebdfbf9b4a (patch) | |
| tree | df16f7da23839963849357c221c9f24826fcee62 /compiler/rustc_codegen_ssa/src | |
| parent | f9567d0f2bc8f6f7f45c42d432a5dbbd161a6104 (diff) | |
| parent | 73f684f3c5421cf328c8e0eea74bc316e6c3c21c (diff) | |
| download | rust-02b1be16c65e5716ade771afde7116ebdfbf9b4a.tar.gz rust-02b1be16c65e5716ade771afde7116ebdfbf9b4a.zip | |
Auto merge of #130348 - Zalathar:rollup-5d0b7a9, r=Zalathar
Rollup of 4 pull requests Successful merges: - #130053 (fix doc comments for Peekable::next_if(_eq)) - #130267 (small_data_threshold.rs: Adapt to LLVM head changes) - #130311 ((fix) conflicting negative impl marker) - #130334 (Fix `SDKROOT` ignore on macOS) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 40eb35deea5..8b855bd0dd5 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -3044,7 +3044,7 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, errors::AppleSdkRootErro "iphonesimulator" if sdkroot.contains("iPhoneOS.platform") || sdkroot.contains("MacOSX.platform") => { } - "macosx10.15" + "macosx" if sdkroot.contains("iPhoneOS.platform") || sdkroot.contains("iPhoneSimulator.platform") => {} "watchos" |