diff options
| author | Robin Kruppe <robin.kruppe@gmail.com> | 2016-12-27 02:13:16 +0100 |
|---|---|---|
| committer | Robin Kruppe <robin.kruppe@gmail.com> | 2016-12-27 16:36:53 +0100 |
| commit | d44bcbf9eea0bc01cc02de78492b40be6ccc0e58 (patch) | |
| tree | 79b363470eb8e8ae7c92e208a7851be77786edd4 /src | |
| parent | c74ac6cb97ae77429258c3bff2938714f6a329ca (diff) | |
| download | rust-d44bcbf9eea0bc01cc02de78492b40be6ccc0e58.tar.gz rust-d44bcbf9eea0bc01cc02de78492b40be6ccc0e58.zip | |
Accept ninja-build binary in place of ninja
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/sanity.rs | 6 |
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 } |
