From dd946feb04880abf64edac2258cb624d8576607e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 27 Mar 2026 15:44:00 +0200 Subject: [PATCH] storage-daemon: use same link arguments as other tools Reviewed-by: Kevin Wolf Signed-off-by: Paolo Bonzini Link: https://lore.kernel.org/r/20260327134401.270186-15-kkostiuk@redhat.com Signed-off-by: Paolo Bonzini --- meson.build | 8 ++++---- storage-daemon/meson.build | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 457491c34e..09cdd31769 100644 --- a/meson.build +++ b/meson.build @@ -4505,15 +4505,15 @@ if xkbcommon.found() endif if have_tools - link_args = enable_modules ? ['@block.syms'] : [] + tools_link_args = enable_modules ? ['@block.syms'] : [] qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep], - link_args: link_args, link_depends: block_syms, + link_args: tools_link_args, link_depends: block_syms, dependencies: [authz, block, crypto, io, qom, qemuutil], install: true) qemu_io = executable('qemu-io', files('qemu-io.c'), - link_args: link_args, link_depends: block_syms, + link_args: tools_link_args, link_depends: block_syms, dependencies: [block, qemuutil], install: true) qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'), - link_args: link_args, link_depends: block_syms, + link_args: tools_link_args, link_depends: block_syms, dependencies: [blockdev, qemuutil, selinux], install: true) diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index 5e61a9d1bd..fc088cbea7 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -1,14 +1,14 @@ +assert(have_tools) + qsd_ss = ss.source_set() qsd_ss.add(files('qemu-storage-daemon.c')) qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil) subdir('qapi') -if have_tools - qsd_ss = qsd_ss.apply({}) - qsd = executable('qemu-storage-daemon', - qsd_ss.sources(), - link_args: '@block.syms', link_depends: block_syms, - dependencies: qsd_ss.dependencies(), - install: true) -endif +qsd_ss = qsd_ss.apply({}) +qsd = executable('qemu-storage-daemon', + qsd_ss.sources(), + link_args: tools_link_args, link_depends: block_syms, + dependencies: qsd_ss.dependencies(), + install: true)