diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-08-21 17:05:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 17:06:17 -0400 |
| commit | 8855e8f0465d449efe96733e1d4bcf6e5cb54d1c (patch) | |
| tree | 78f6cd28aee7537e27a79b9c53a670ca21847f40 | |
| parent | 28742467c9c0bd49f594bfd46ecca5e6398ddb12 (diff) | |
meson: Fix --disable-tools --enable-system builds
Fixes:
$ ../configure --disable-tools --disable-user
../tests/qemu-iotests/meson.build:7:0: ERROR: Unknown variable "qemu_block_tools".
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200821150556.1235625-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build index dd8016c9da..df5bf728b5 100644 --- a/meson.build +++ b/meson.build @@ -1068,12 +1068,13 @@ if 'CONFIG_XKBCOMMON' in config_host dependencies: [qemuutil, xkbcommon], install: have_tools) endif +qemu_block_tools = [] if have_tools qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [authz, block, crypto, io, qom, qemuutil], install: true) qemu_io = executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) - qemu_block_tools = [qemu_img, qemu_io] + qemu_block_tools += [qemu_img, qemu_io] if targetos == 'linux' or targetos == 'sunos' or targetos.endswith('bsd') qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) |