diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-17 16:32:06 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-12-20 10:13:12 -0800 |
| commit | 4d06bb4e030fcb99c161d070f22e4ca79aced0a9 (patch) | |
| tree | 365ed7c6f5393f19d19f94cff1ac5f2c5159fda2 | |
| parent | ff9c1e5500141df7be15446ccfbdc66752812a9a (diff) | |
| download | focaccia-qemu-4d06bb4e030fcb99c161d070f22e4ca79aced0a9.tar.gz focaccia-qemu-4d06bb4e030fcb99c161d070f22e4ca79aced0a9.zip | |
meson: Move linux_user_ss to linux-user/
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>
| -rw-r--r-- | linux-user/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linux-user/meson.build b/linux-user/meson.build index ca8b86f209..b2f4afd5e7 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -2,6 +2,8 @@ if not have_linux_user subdir_done() endif +linux_user_ss = ss.source_set() + common_user_inc += include_directories('host/' / host_arch) common_user_inc += include_directories('.') @@ -42,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) diff --git a/meson.build b/meson.build index eebeaab9ce..cc4df68b20 100644 --- a/meson.build +++ b/meson.build @@ -2382,7 +2382,6 @@ common_user_ss = ss.source_set() crypto_ss = ss.source_set() hwcore_ss = ss.source_set() io_ss = ss.source_set() -linux_user_ss = ss.source_set() qmp_ss = ss.source_set() qom_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_LINUX_USER', if_true: linux_user_ss) - common_user_ss = common_user_ss.apply(config_all, strict: false) common_user = static_library('common-user', sources: common_user_ss.sources(), |