nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/sanity.rs
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
}