diff options
author | Filipe Brandenburger <filbranden@google.com> | 2018-04-04 00:32:59 -0700 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-04-04 09:32:59 +0200 |
commit | 63554ed9073fd7e2cb95204c39e14ff7d9141d9b (patch) | |
tree | 7a75f69dbd83a0b6aac39cde4176d1eed599f9f1 /tools | |
parent | Merge pull request #8643 from poettering/coding-style-fixlets (diff) | |
download | systemd-63554ed9073fd7e2cb95204c39e14ff7d9141d9b.tar.gz systemd-63554ed9073fd7e2cb95204c39e14ff7d9141d9b.tar.bz2 systemd-63554ed9073fd7e2cb95204c39e14ff7d9141d9b.zip |
oss-fuzz: Fallback to `ninja-build` when available (#8641)
The ninja binary is deployed as `ninja-build` in older distros such as
RHEL 7/CentOS 7. Detect that and use `ninja-build` instead of `ninja`
when it's available.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/meson-build.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/meson-build.sh b/tools/meson-build.sh index 302749d8e..304a75567 100755 --- a/tools/meson-build.sh +++ b/tools/meson-build.sh @@ -7,4 +7,12 @@ target="$3" options="$4" [ -d "$dst" ] || meson "$src" "$dst" $options -ninja -C "$dst" "$target" + +# Locate ninja binary, on CentOS 7 it is called ninja-build, so +# use that name if available. +ninja=ninja +if which ninja-build >/dev/null 2>&1 ; then + ninja=ninja-build +fi + +"$ninja" -C "$dst" "$target" |