Merge tag 'bsd-user-mmap-pull-request' of https://gitlab.com/bsdimp/qemu into staging

[mirror_qemu.git] / bsd-user / meson.build

diff --git a/bsd-user/meson.build b/bsd-user/meson.build
index 25c3976eade21c3096feb41fb633d01923d0be1e..c6bfd3b2b539cdcef9bbc82bdc2d5aab59caf51f 100644 (file)
--- a/bsd-user/meson.build
+++ b/bsd-user/meson.build
@@ -2,18 +2,28 @@ if not have_bsd_user
    subdir_done()
 endif
 
-common_user_inc += include_directories('.')
+bsd_user_ss = ss.source_set()
+
+common_user_inc += include_directories('include')
 
 bsd_user_ss.add(files(
+  'bsd-mem.c',
+  'bsd-proc.c',
   'bsdload.c',
   'elfload.c',
   'main.c',
   'mmap.c',
   'signal.c',
   'strace.c',
-  'syscall.c',
   'uaccess.c',
 ))
 
+elf = cc.find_library('elf', required: true)
+procstat = cc.find_library('procstat', required: true)
+kvm = cc.find_library('kvm', required: true)
+bsd_user_ss.add(elf, procstat, kvm)
+
 # Pull in the OS-specific build glue, if any
 subdir(targetos)
+
+specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)