From f1548ec94dcc32634a607389765f76f51cd94eee Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Thu, 22 Feb 2024 02:24:35 +0100
Subject: [PATCH] Remove redundant `-Wl,-syslibroot`
Clang already passes this when invoking the linker:
https://github.com/llvm/llvm-project/blob/llvmorg-17.0.6/clang/lib/Driver/ToolChains/Darwin.cpp#L439-L442
---
compiler/rustc_codegen_ssa/src/back/link.rs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 435b517e602b1..a35899bca52e7 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -2939,7 +2939,13 @@ fn add_apple_sdk(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
match flavor {
LinkerFlavor::Darwin(Cc::Yes, _) => {
- cmd.args(&["-isysroot", &sdk_root, "-Wl,-syslibroot", &sdk_root]);
+ // Use `-isysroot` instead of `--sysroot`, as only the former
+ // makes Clang treat it as a platform SDK.
+ //
+ // This is admittedly a bit strange, as on most targets
+ // `-isysroot` only applies to include header files, but on Apple
+ // targets this also applies to libraries and frameworks.
+ cmd.args(&["-isysroot", &sdk_root]);
}
LinkerFlavor::Darwin(Cc::No, _) => {
cmd.args(&["-syslibroot", &sdk_root]);