From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 16 Jan 2018 23:49:58 +0000 (-0800)
Subject: rustc: Spawn `cmd /c` for `.bat` scripts
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6defae31f6bf548f75974c555b4cceaef4b8ef15;p=rust.git

rustc: Spawn `cmd /c` for `.bat` scripts

This fixes an accidental regression #46335 where the behavior of
`Path::ends_with` is different from `str::ends_with` (paths operate over
components, strs operate over chars).
---

diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index 13a319d31bf..f53c5b3f581 100644
--- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs
@@ -69,13 +69,14 @@ pub fn get_linker(sess: &Session) -> (PathBuf, Command, Vec<(OsString, OsString)
     // was tagged as #42791) and some more info can be found on #44443 for
     // emscripten itself.
     let cmd = |linker: &Path| {
-        if cfg!(windows) && linker.ends_with(".bat") {
-            let mut cmd = Command::new("cmd");
-            cmd.arg("/c").arg(linker);
-            cmd
-        } else {
-            Command::new(linker)
+        if let Some(linker) = linker.to_str() {
+            if cfg!(windows) && linker.ends_with(".bat") {
+                let mut cmd = Command::new("cmd");
+                cmd.arg("/c").arg(linker);
+                return cmd
+            }
         }
+        Command::new(linker)
     };
 
     if let Some(ref linker) = sess.opts.cg.linker {