Skip to content

Commit 3f957eb

Browse files
committed
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
2 parents e571f2d + d44bcbf commit 3f957eb

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/bootstrap/sanity.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ pub fn check(build: &mut Build) {
7878
}
7979
need_cmd("cmake".as_ref());
8080
if build.config.ninja {
81-
need_cmd("ninja".as_ref())
81+
// Some Linux distros rename `ninja` to `ninja-build`.
82+
// CMake can work with either binary name.
83+
if have_cmd("ninja-build".as_ref()).is_none() {
84+
need_cmd("ninja".as_ref());
85+
}
8286
}
8387
break
8488
}

0 commit comments

Comments
 (0)