tools: explicitly specify "setup" subcommand

As invoking meson without subcommand is deprecated since 0.64.0.

diff --git a/tools/meson-build.sh b/tools/meson-build.sh
index c8370a7e6a970b0b3f7c31164bc4baed83125b19..2ef60cfa8e3e889a8b4279e66bf8a872ce072db6 100755 (executable)
--- 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 7e9312b833470cc56b863a60158516063d888344..2e64475c6d744bc1aac77918c0a2cc02dbcfdf3d 100755 (executable)
--- 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