From 8553aeeb66afa1369548f9e7d88409459f5ff815 Mon Sep 17 00:00:00 2001
From: Shaheen Gandhi <shaheen@fb.com>
Date: Sat, 19 Dec 2020 19:32:07 -0800
Subject: [PATCH] Use -target when linking binaries for Mac Catalyst
---
compiler/rustc_codegen_ssa/src/back/link.rs | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index ccd4d103ddb..a3e230a7f69 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -2197,8 +2197,13 @@ fn add_apple_sdk(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
return;
}
};
- let arch_name = llvm_target.split('-').next().expect("LLVM target must have a hyphen");
- cmd.args(&["-arch", arch_name, "-isysroot", &sdk_root, "-Wl,-syslibroot", &sdk_root]);
+ if llvm_target.contains("macabi") {
+ cmd.args(&["-target", llvm_target])
+ } else {
+ let arch_name = llvm_target.split('-').next().expect("LLVM target must have a hyphen");
+ cmd.args(&["-arch", arch_name])
+ }
+ cmd.args(&["-isysroot", &sdk_root, "-Wl,-syslibroot", &sdk_root]);
}
fn get_apple_sdk_root(sdk_name: &str) -> Result<String, String> {