diff options
| author | Paolo Bonzini | 2021-12-21 16:09:54 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2022-01-12 14:08:29 +0100 |
| commit | 9d24fb73a1c1b0d892f8c26297f922c85460513d (patch) | |
| tree | 3ed59d16a3c28ec3e2a30607e7b5957a5cc7523f /meson.build | |
| parent | user: move common-user includes to a subdirectory of {bsd,linux}-user/ (diff) | |
| download | qemu-9d24fb73a1c1b0d892f8c26297f922c85460513d.tar.gz qemu-9d24fb73a1c1b0d892f8c26297f922c85460513d.tar.xz qemu-9d24fb73a1c1b0d892f8c26297f922c85460513d.zip | |
meson: cleanup common-user/ build
It is not necessary to have a separate static_library just for common_user
files; using the one that already covers the rest of common_ss is enough
unless you need to reuse some source files between emulators and tests.
Just place common files for all user-mode emulators in common_ss,
similar to what is already done for softmmu_ss in full system emulators.
The only disadvantage is that the include_directories under bsd-user/include/
and linux-user/include/ are now enabled for all targets rather than only
user mode emulators. This however is not different from how include/sysemu/
is available when building user mode emulators.
Tested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/meson.build b/meson.build index 2aa44c965a..f0567daf42 100644 --- a/meson.build +++ b/meson.build @@ -2399,7 +2399,6 @@ blockdev_ss = ss.source_set() block_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() -common_user_ss = ss.source_set() crypto_ss = ss.source_set() hwcore_ss = ss.source_set() io_ss = ss.source_set() @@ -2651,17 +2650,6 @@ subdir('common-user') subdir('bsd-user') subdir('linux-user') -common_user_ss = common_user_ss.apply(config_all, strict: false) -common_user = static_library('common-user', - sources: common_user_ss.sources(), - dependencies: common_user_ss.dependencies(), - include_directories: common_user_inc, - name_suffix: 'fa', - build_by_default: false) -common_user = declare_dependency(link_with: common_user) - -user_ss.add(common_user) - # needed for fuzzing binaries subdir('tests/qtest/libqos') subdir('tests/qtest/fuzz') @@ -2879,6 +2867,7 @@ common_all = common_ss.apply(config_all, strict: false) common_all = static_library('common', build_by_default: false, sources: common_all.sources() + genh, + include_directories: common_user_inc, implicit_include_directories: false, dependencies: common_all.dependencies(), name_suffix: 'fa') |