]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #77543 - Mark-Simulacrum:rsp-quoting, r=eddyb
authorbors <bors@rust-lang.org>
Mon, 5 Oct 2020 13:54:22 +0000 (13:54 +0000)
committerbors <bors@rust-lang.org>
Mon, 5 Oct 2020 13:54:22 +0000 (13:54 +0000)
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.

compiler/rustc_codegen_ssa/src/back/command.rs

index 0208bb73abdbe1e5d3c07e0c53ec190e73b8366e..503c51d24b682a74c03b33dd545d7242c6a0b96e 100644 (file)
@@ -111,6 +111,12 @@ pub fn command(&self) -> process::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
             }
         };