Auto merge of #38627 - rkruppe:ninja-build, r=alexcrichton

Accept ninja-build binary in place of ninja

See comment in the diff for rationale.

r? @alexcrichton
This commit is contained in:
bors 2016-12-29 13:48:50 +00:00
commit 3f957ebeff
1 changed files with 5 additions and 1 deletions

View File

@ -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
}