about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-10-05 13:54:22 +0000
committerbors <bors@rust-lang.org>2020-10-05 13:54:22 +0000
commitf317a93d4d326442680eaeb78c22eece739433c7 (patch)
tree1ac191096d9bf34070c890435940189ba792acfd
parentd890e64dff3fd2c28635c60cc9315648dd46c8f7 (diff)
parente8325b0f40ab69c59e5c5a3233945d3df98e8abd (diff)
downloadrust-f317a93d4d326442680eaeb78c22eece739433c7.tar.gz
rust-f317a93d4d326442680eaeb78c22eece739433c7.zip
Auto merge of #77543 - Mark-Simulacrum:rsp-quoting, r=eddyb
Force posix-style quoting on lld, independent of host platform

This just blindly applies the logic from `@eddyb's` comment here: https://github.com/rust-lang/rust/issues/76466#issuecomment-699024973

Hopefully, this fixed #76466 -- I cannot test this though.
-rw-r--r--compiler/rustc_codegen_ssa/src/back/command.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/command.rs b/compiler/rustc_codegen_ssa/src/back/command.rs
index 0208bb73abd..503c51d24b6 100644
--- a/compiler/rustc_codegen_ssa/src/back/command.rs
+++ b/compiler/rustc_codegen_ssa/src/back/command.rs
@@ -111,6 +111,12 @@ impl Command {
                     LldFlavor::Link => "link",
                     LldFlavor::Ld64 => "darwin",
                 });
+                if let LldFlavor::Wasm = flavor {
+                    // LLVM expects host-specific formatting for @file
+                    // arguments, but we always generate posix formatted files
+                    // at this time. Indicate as such.
+                    c.arg("--rsp-quoting=posix");
+                }
                 c
             }
         };