Skip to content

Commit 3a489d3

Browse files
philmdbonzini
authored andcommitted
meson: Declare have_virtfs_proxy_helper in main meson.build
have_virtfs_proxy_helper is used from docs/meson.build, and can be not declared when including it before fsdev/meson.build. This fixes: ../docs/meson.build:54:2: ERROR: Unknown variable "have_virtfs_proxy_helper". Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 0ba7819 commit 3a489d3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

fsdev/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
88
), if_false: files('qemu-fsdev-dummy.c'))
99
softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
1010

11-
have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() and have_virtfs
1211
if have_virtfs_proxy_helper
1312
executable('virtfs-proxy-helper',
1413
files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),

meson.build

+2
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,8 @@ have_virtfs = (targetos == 'linux' and
10341034
libattr.found() and
10351035
libcap_ng.found())
10361036

1037+
have_virtfs_proxy_helper = have_virtfs and have_tools
1038+
10371039
if get_option('virtfs').enabled()
10381040
if not have_virtfs
10391041
if targetos != 'linux'

0 commit comments

Comments
 (0)