summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorMartin Kletzander <mkletzan@redhat.com>2022-01-22 20:30:11 +0100
committerMartin Kletzander <mkletzan@redhat.com>2022-01-24 09:54:35 +0100
commit4c69d64efa3731d074d198f871fd42e74c4a39f6 (patch)
tree984c34e44f98ebde3674b81254f1b0a7f9109feb /build-aux
parent2e2c9797c5cc77d33da6198455c30cc28743211d (diff)
downloadlibvirt-4c69d64efa3731d074d198f871fd42e74c4a39f6.tar.gz
meson: Explicitly specify run_command's check parameter
An update to meson 0.61.1 meant that it started showing warnings due to the fact that the default for run_command's 'check' parameter is going to change. It unveiled the fact that we were even missing that parameter in some calls where we expected different outcome. To make sure the behaviour does not change specify the parameter explicitly. In places where we check for the return code the parameter should be 'false' so that meson does not fail. In all other cases the parameter should be set to 'true' to make sure possible failure also stops meson. The warning in meson was added in https://github.com/mesonbuild/meson/pull/9304 Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/meson.build b/build-aux/meson.build
index e491bdeebc..f4d0130e3b 100644
--- a/build-aux/meson.build
+++ b/build-aux/meson.build
@@ -20,7 +20,7 @@ endif
if host_machine.system() == 'freebsd'
grep_prog = find_program('grep')
- grep_cmd = run_command(grep_prog, '--version')
+ grep_cmd = run_command(grep_prog, '--version', check: true)
if grep_cmd.stdout().startswith('grep (BSD grep')
grep_prog = find_program('/usr/local/bin/grep', required: false)
if not grep_prog.found()