[v3] Build system and KVM changes for 2021-12-23

[PULL 01/15] meson: reuse common_user_inc when building files specific to user-mode emulators

Paolo Bonzini posted 15 patches 4 years, 1 month ago

Diff against v1 v4 v5
Download mbox

Maintainers: Christian Borntraeger <borntraeger@linux.ibm.com>, Marcelo Tosatti <mtosatti@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Laurent Vivier <laurent@vivier.eu>, Riku Voipio <riku.voipio@iki.fi>, Thomas Huth <thuth@redhat.com>, Kyle Evans <kevans@freebsd.org>, Cornelia Huck <cohuck@redhat.com>, Mahmoud Mandour <ma.mandourr@gmail.com>, Warner Losh <imp@bsdimp.com>, Kevin Wolf <kwolf@redhat.com>, Cleber Rosa <crosa@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Hanna Reitz <hreitz@redhat.com>, Alexandre Iooss <erdnaxe@crans.org>

There is a newer version of this series

Expand all Fold all

[PULL 01/15] meson: reuse common_user_inc when building files specific to user-mode emulators

Posted by Paolo Bonzini 4 years, 1 month ago

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 53065e96ec..de111d6fa1 100644
--- a/meson.build
+++ b/meson.build
@@ -2919,6 +2919,7 @@ foreach target : target_dirs
   else
     abi = config_target['TARGET_ABI_DIR']
     target_type='user'
+    target_inc += common_user_inc
     qemu_target_name = 'qemu-' + target_name
     if target_base_arch in target_user_arch
       t = target_user_arch[target_base_arch].apply(config_target, strict: false)
@@ -2927,7 +2928,6 @@ foreach target : target_dirs
     endif
     if 'CONFIG_LINUX_USER' in config_target
       base_dir = 'linux-user'
-      target_inc += include_directories('linux-user/host/' / host_arch)
     endif
     if 'CONFIG_BSD_USER' in config_target
       base_dir = 'bsd-user'
-- 
2.33.1