diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-05-08 15:03:24 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-05-08 15:04:02 +0200 |
| commit | 1bcad2de7c6fef0c3aaeb3165be1974e3a11757a (patch) | |
| tree | 540ce39f16bbf8257f3a3fc9690064ad983c874b /mkosi.presets | |
| parent | 385fb4e3234d5e9666ca8d984a6b377739c2cbde (diff) | |
| download | systemd-1bcad2de7c6fef0c3aaeb3165be1974e3a11757a.tar.gz | |
mkosi.build: print important build commands
This undoes the effect of 1394a3ec351048bae008627a0775d1f9a6c46294 partially.
We print the fairly verbose output of the build commands, so let's also
print the commands themselves. This makes it much easier to understand what
is going on.
(The style was copied from other scripts where we do 'set -x' for one command.)
Diffstat (limited to 'mkosi.presets')
| -rwxr-xr-x | mkosi.presets/00-base/mkosi.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkosi.presets/00-base/mkosi.build b/mkosi.presets/00-base/mkosi.build index 4b6cff662f..5db96006fe 100755 --- a/mkosi.presets/00-base/mkosi.build +++ b/mkosi.presets/00-base/mkosi.build @@ -174,10 +174,10 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then ) fi - meson setup "$BUILDDIR" "${CONFIGURE_OPTS[@]}" + ( set -x; meson setup "$BUILDDIR" "${CONFIGURE_OPTS[@]}" ) fi -ninja -C "$BUILDDIR" "$@" +( set -x; ninja -C "$BUILDDIR" "$@" ) if [ "$WITH_TESTS" = 1 ]; then if [ -n "$SANITIZERS" ]; then export ASAN_OPTIONS="$MKOSI_ASAN_OPTIONS" @@ -187,7 +187,7 @@ if [ "$WITH_TESTS" = 1 ]; then TIMEOUT_MULTIPLIER=1 fi - meson test -C "$BUILDDIR" --print-errorlogs --timeout-multiplier=$TIMEOUT_MULTIPLIER + ( set -x; meson test -C "$BUILDDIR" --print-errorlogs --timeout-multiplier=$TIMEOUT_MULTIPLIER ) fi -meson install -C "$BUILDDIR" --quiet --no-rebuild --only-changed +( set -x; meson install -C "$BUILDDIR" --quiet --no-rebuild --only-changed ) |