motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Move linux_user_ss to linux-user/

Browse source 
We have no need to reference linux_user_ss outside of linux-user.
Go ahead and merge it directly into specific_ss.

Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-11-17 16:32:06 +01:00
parent ff9c1e5500
commit 4d06bb4e03
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
linux-user/meson.build
View file

@ -2,6 +2,8 @@ if not have_linux_user
subdir_done() subdir_done()
endif endif
linux_user_ss = ss.source_set()
common_user_inc += include_directories('host/' / host_arch) common_user_inc += include_directories('host/' / host_arch)
common_user_inc += include_directories('.') common_user_inc += include_directories('.')
@ -42,3 +44,5 @@ subdir('sh4')
subdir('sparc') subdir('sparc')
subdir('x86_64') subdir('x86_64')
subdir('xtensa') subdir('xtensa')
specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)

3
meson.build
View file

@ -2382,7 +2382,6 @@ common_user_ss = ss.source_set()
crypto_ss = ss.source_set() crypto_ss = ss.source_set()
hwcore_ss = ss.source_set() hwcore_ss = ss.source_set()
io_ss = ss.source_set() io_ss = ss.source_set()
linux_user_ss = ss.source_set()
qmp_ss = ss.source_set() qmp_ss = ss.source_set()
qom_ss = ss.source_set() qom_ss = ss.source_set()
softmmu_ss = ss.source_set() softmmu_ss = ss.source_set()
@ -2633,8 +2632,6 @@ subdir('linux-user')
specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
common_user_ss = common_user_ss.apply(config_all, strict: false) common_user_ss = common_user_ss.apply(config_all, strict: false)
common_user = static_library('common-user', common_user = static_library('common-user',
sources: common_user_ss.sources(), sources: common_user_ss.sources(),