picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mkosi: no need to determine meson parameters if we don't run meson 

Small optimization.
This commit is contained in:
Lennart Poettering 2018-02-09 19:22:40 +01:00
parent cc6271f17d
commit c81a256914
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkosi.build
View File

@ -27,6 +27,7 @@ set -ex
export LC_CTYPE=en_US.UTF-8
if [ ! -f "$BUILDDIR"/build.ninja ] ; then
sysvinit_path=`realpath /etc/init.d`
nobody_user=`id -u -n 65534 2> /dev/null`
@ -63,7 +64,9 @@ if [ "$nobody_group" = "" ] ; then
fi
fi
[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D default-hierarchy=unified -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D default-hierarchy=unified -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
fi
ninja -C "$BUILDDIR" all
[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test || ( RET="$?" ; cat "$BUILDDIR"/meson-logs/testlog.txt ; exit "$RET" )
ninja -C "$BUILDDIR" install