Execute cmd directory for bat scripts on Windows

rust-lang · Sep 8, 2017 · 510d34f · 510d34f
1 parent 3c636f7
commit 510d34f
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1309,22 +1309,20 @@ impl Build {
             })
             .or_else(|| {
                 if target.contains("emscripten") {
-                    //Windows uses bat file so we have to be a bit more specific
                     let tool = if self.cpp {
-                        if cfg!(windows) {
-                            "em++.bat"
-                        } else {
-                            "em++"
-                        }
+                        "em++"
                     } else {
-                        if cfg!(windows) {
-                            "emcc.bat"
-                        } else {
-                            "emcc"
-                        }
+                        "emcc"
                     };
-
-                    Some(Tool::new(PathBuf::from(tool)))
+                    // Windows uses bat file so we have to be a bit more specific
+                    if cfg!(windows) {
+                        let mut t = Tool::new(PathBuf::from("cmd"));
+                        t.args.push("/c".into());
+                        t.args.push(format!("{}.bat", tool).into());
+                        Some(t)
+                    } else {
+                        Some(Tool::new(PathBuf::from(tool)))
+                    }
                 } else {
                     None
                 }