[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] meson: Only build virtfs-proxy-helper if all requisites are
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 1/3] meson: Only build virtfs-proxy-helper if all requisites are found |
Date: |
Tue, 25 May 2021 12:46:46 +0200 |
We first set have_virtfs_proxy_helper depending on have_virtfs,
then update have_virtfs... While this might work, it is not clear
when looking at the code logic. Move the have_virtfs_proxy_helper
assignation *after* updating have_virtfs to make it obvious.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 632b380738d..2a7d69cf428 100644
--- a/meson.build
+++ b/meson.build
@@ -1081,8 +1081,6 @@
libattr.found() and
libcap_ng.found())
-have_virtfs_proxy_helper = have_virtfs and have_tools
-
if get_option('virtfs').enabled()
if not have_virtfs
if targetos != 'linux'
@@ -1097,6 +1095,8 @@
have_virtfs = false
endif
+have_virtfs_proxy_helper = have_virtfs and have_tools
+
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') /
get_option('bindir'))
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') /
qemu_confdir)
--
2.26.3