storage-daemon: use same link arguments as other tools
Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Link: https://lore.kernel.org/r/20260327134401.270186-15-kkostiuk@redhat.com Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini committed
Mar 27, 2026 at 15:44 UTC
dd946feb04880abf64edac2258cb624d8576607e
2 files changed
+12
-12
meson.build
+4
-4
@@ -4505,15 +4505,15 @@ if xkbcommon.found()
4505
endif
4506
4507
if have_tools
4508
- link_args = enable_modules ? ['@block.syms'] : []
4508
+ tools_link_args = enable_modules ? ['@block.syms'] : []
4509
qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
4510
- link_args: link_args, link_depends: block_syms,
4510
+ link_args: tools_link_args, link_depends: block_syms,
4511
dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
4512
qemu_io = executable('qemu-io', files('qemu-io.c'),
4513
- link_args: link_args, link_depends: block_syms,
4513
+ link_args: tools_link_args, link_depends: block_syms,
4514
dependencies: [block, qemuutil], install: true)
4515
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
4516
- link_args: link_args, link_depends: block_syms,
4516
+ link_args: tools_link_args, link_depends: block_syms,
4517
dependencies: [blockdev, qemuutil, selinux],
4518
install: true)
4519
storage-daemon/meson.build
+8
-8
@@ -1,14 +1,14 @@
1
+assert(have_tools)
2
+
3
qsd_ss = ss.source_set()
4
qsd_ss.add(files('qemu-storage-daemon.c'))
5
qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil)
6
7
subdir('qapi')
8
7
-if have_tools
8
- qsd_ss = qsd_ss.apply({})
9
- qsd = executable('qemu-storage-daemon',
10
- qsd_ss.sources(),
11
- link_args: '@block.syms', link_depends: block_syms,
12
- dependencies: qsd_ss.dependencies(),
13
- install: true)
14
-endif
9
+qsd_ss = qsd_ss.apply({})
10
+qsd = executable('qemu-storage-daemon',
11
+ qsd_ss.sources(),
12
+ link_args: tools_link_args, link_depends: block_syms,
13
+ dependencies: qsd_ss.dependencies(),
14
+ install: true)