Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

[qemu.git] / linux-user / meson.build

diff --git a/linux-user/meson.build b/linux-user/meson.build
index eef1dd68bd3652b2f344d7540fbc69c7d068f946..de4320af053cd45d5b659c22cfa8ed6fc8a09755 100644 (file)
--- a/linux-user/meson.build
+++ b/linux-user/meson.build
@@ -2,8 +2,10 @@ if not have_linux_user
    subdir_done()
 endif
 
-common_user_inc += include_directories('host/' / host_arch)
-common_user_inc += include_directories('.')
+linux_user_ss = ss.source_set()
+
+common_user_inc += include_directories('include/host/' / host_arch)
+common_user_inc += include_directories('include')
 
 linux_user_ss.add(files(
   'elfload.c',
@@ -15,6 +17,7 @@ linux_user_ss.add(files(
   'signal.c',
   'strace.c',
   'syscall.c',
+  'thunk.c',
   'uaccess.c',
   'uname.c',
 ))
@@ -41,3 +44,5 @@ subdir('sh4')
 subdir('sparc')
 subdir('x86_64')
 subdir('xtensa')
+
+specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)