From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Wed, 26 Jun 2024 18:42:55 +0000 (+0200)
Subject: meson: fix build with -Dtools-multicall=true on NixOS
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01ae1fe55ec2620abee3aa9a7e89456237aa363c;p=thirdparty%2Flxc.git

meson: fix build with -Dtools-multicall=true on NixOS

See also:
https://github.com/lxc/lxc/pull/4428

Fixes: #4427
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---

diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build
index 6d317fc80..29e7bca41 100644
--- a/src/lxc/tools/meson.build
+++ b/src/lxc/tools/meson.build
@@ -36,7 +36,7 @@ if want_tools
 endif
 
 if want_tools_multicall
-    tools_all_sources = files('lxc_multicall.c') + tools_common_sources_for_dynamic_link
+    tools_all_sources = files('lxc_multicall.c') + files('arguments.c', 'arguments.h')
     foreach cmd : tools_commands
         tools_all_sources += files('lxc_' + cmd + '.c')
     endforeach
@@ -45,8 +45,8 @@ if want_tools_multicall
         'lxc',
         tools_all_sources,
         include_directories: liblxc_includes,
-        dependencies: liblxc_dep,
-        link_with: [liblxc_static],
+        dependencies: liblxc_dependencies,
+        link_whole: [liblxc_static],
         install: true)
 
     if want_tools == false