Support combination MSVC + Ninja

rust-lang · Mar 4, 2017 · a7c8afd · a7c8afd
1 parent f218709
commit a7c8afd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -740,7 +740,7 @@ impl Build {
         } else {
             let base = self.llvm_out(&self.config.build).join("build");
             let exe = exe("FileCheck", target);
-            if self.config.build.contains("msvc") {
+            if !self.config.ninja && self.config.build.contains("msvc") {
                 base.join("Release/bin").join(exe)
             } else {
                 base.join("bin").join(exe)