diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-03 20:06:09 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-03 20:06:30 +0900 |
| commit | e3b2f7c056551fa50ba6ed13703b8e63ba8303c7 (patch) | |
| tree | ca0b1ac42a8a156a11bc847b35fa650a848a1040 | |
| parent | d2ec38e2b2d7baa374ffbd0f81f1183e78ce1ca6 (diff) | |
| download | systemd-e3b2f7c056551fa50ba6ed13703b8e63ba8303c7.tar.gz | |
tools: explicitly specify "setup" subcommand
As invoking meson without subcommand is deprecated since 0.64.0.
| -rwxr-xr-x | tools/meson-build.sh | 2 | ||||
| -rwxr-xr-x | tools/oss-fuzz.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/meson-build.sh b/tools/meson-build.sh index c8370a7e6a..2ef60cfa8e 100755 --- a/tools/meson-build.sh +++ b/tools/meson-build.sh @@ -10,7 +10,7 @@ CC="$5" CXX="$6" # shellcheck disable=SC2086 -[ -f "$dst/build.ninja" ] || CC="$CC" CXX="$CXX" meson "$src" "$dst" $options +[ -f "$dst/build.ninja" ] || CC="$CC" CXX="$CXX" meson setup "$src" "$dst" $options # Locate ninja binary, on CentOS 7 it is called ninja-build, so # use that name if available. diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh index 7e9312b833..2e64475c6d 100755 --- a/tools/oss-fuzz.sh +++ b/tools/oss-fuzz.sh @@ -73,7 +73,7 @@ else fi fi -if ! meson "$build" "-D$fuzzflag" -Db_lundef=false; then +if ! meson setup "$build" "-D$fuzzflag" -Db_lundef=false; then cat "$build/meson-logs/meson-log.txt" exit 1 fi |