Skip to content

Commit

Permalink
Auto merge of rust-lang#38627 - rkruppe:ninja-build, r=alexcrichton
Browse files Browse the repository at this point in the history
Accept ninja-build binary in place of ninja

See comment in the diff for rationale.

r? @alexcrichton
  • Loading branch information
bors committed Dec 29, 2016
2 parents e571f2d + d44bcbf commit 3f957eb
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/bootstrap/sanity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 3f957eb

Please sign in to comment.