1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-26 17:25:34 +03:00

github: use 'meson setup'

Meson started warning when 'setup' is not used:
WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.

Also add more quoting in output to make the message clearer.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-01-11 15:04:11 +01:00 committed by Lennart Poettering
parent c9c35a3ffa
commit 8112c91e48

View File

@ -143,7 +143,8 @@ for args in "${ARGS[@]}"; do
if ! AR="$AR" \
CC="$CC" CC_LD="$LD" CFLAGS="-Werror" \
CXX="$CXX" CXX_LD="$LD" CXXFLAGS="-Werror" \
meson -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
meson setup \
-Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
-Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" \
$args build; then
@ -152,7 +153,7 @@ for args in "${ARGS[@]}"; do
fi
if ! meson compile -C build -v; then
fatal "'meson compile' failed with $args"
fatal "'meson compile' failed with '$args'"
fi
for loader in build/src/boot/efi/*.efi; do
@ -163,5 +164,5 @@ for args in "${ARGS[@]}"; do
git clean -dxf
success "Build with $args passed in $SECONDS seconds"
success "Build with '$args' passed in $SECONDS seconds"
done