about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2017-02-27 23:39:16 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2017-03-04 21:38:26 +0300
commita7c8afd28d45018f3c3af9dec569c36bd4dea10a (patch)
treef36095b91fbfdfc8499b021d693a8b557d8517ba /src/bootstrap
parentf2187093f8d19c39071502c9e95bacabd5febd88 (diff)
downloadrust-a7c8afd28d45018f3c3af9dec569c36bd4dea10a.tar.gz
rust-a7c8afd28d45018f3c3af9dec569c36bd4dea10a.zip
Support combination MSVC + Ninja
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 5215b281fac..98b68d870d3 100644
--- 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)