about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShaheen Gandhi <shaheen@fb.com>2020-12-19 19:32:07 -0800
committerShaheen Gandhi <shaheen@fb.com>2020-12-19 19:32:37 -0800
commit8553aeeb66afa1369548f9e7d88409459f5ff815 (patch)
treee107c3f5615225a9980cbfa8c1badfac7f416835
parentc1d58436614ad522e4db9113ac56d90ec4a95448 (diff)
downloadrust-8553aeeb66afa1369548f9e7d88409459f5ff815.tar.gz
rust-8553aeeb66afa1369548f9e7d88409459f5ff815.zip
Use -target when linking binaries for Mac Catalyst
-rw-r--r--compiler/rustc_codegen_ssa/src/back/link.rs9
1 files 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> {