about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorRobin Kruppe <robin.kruppe@gmail.com>2016-12-27 02:13:16 +0100
committerRobin Kruppe <robin.kruppe@gmail.com>2016-12-27 16:36:53 +0100
commitd44bcbf9eea0bc01cc02de78492b40be6ccc0e58 (patch)
tree79b363470eb8e8ae7c92e208a7851be77786edd4 /src
parentc74ac6cb97ae77429258c3bff2938714f6a329ca (diff)
downloadrust-d44bcbf9eea0bc01cc02de78492b40be6ccc0e58.tar.gz
rust-d44bcbf9eea0bc01cc02de78492b40be6ccc0e58.zip
Accept ninja-build binary in place of ninja
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/sanity.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index 5d543419fc9..66bdd5e00f4 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -78,7 +78,11 @@ pub fn check(build: &mut Build) {
         }
         need_cmd("cmake".as_ref());
         if build.config.ninja {
-            need_cmd("ninja".as_ref())
+            // Some Linux distros rename `ninja` to `ninja-build`.
+            // CMake can work with either binary name.
+            if have_cmd("ninja-build".as_ref()).is_none() {
+                need_cmd("ninja".as_ref());
+            }
         }
         break
     }