On Wed, Nov 17, 2021 at 9:04 AM Richard Henderson <
richard.hender...@linaro.org> wrote:
> We have no need to reference bsd_user_ss outside of bsd-user.
> Go ahead and merge it directly into specific_ss.
>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> meson.build | 3 ---
> bsd-user/meson.build | 4 ++++
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
> diff --git a/meson.build b/meson.build
> index ecc181ea13..9f7756a805 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2356,7 +2356,6 @@ genh += hxdep
> authz_ss = ss.source_set()
> blockdev_ss = ss.source_set()
> block_ss = ss.source_set()
> -bsd_user_ss = ss.source_set()
> chardev_ss = ss.source_set()
> common_ss = ss.source_set()
> common_user_ss = ss.source_set()
> @@ -2611,8 +2610,6 @@ subdir('common-user')
> subdir('bsd-user')
> subdir('linux-user')
>
> -specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
> -
> common_user_ss = common_user_ss.apply(config_all, strict: false)
> common_user = static_library('common-user',
> sources: common_user_ss.sources(),
> diff --git a/bsd-user/meson.build b/bsd-user/meson.build
> index 25c3976ead..9fcb80c3fa 100644
> --- a/bsd-user/meson.build
> +++ b/bsd-user/meson.build
> @@ -2,6 +2,8 @@ if not have_bsd_user
> subdir_done()
> endif
>
> +bsd_user_ss = ss.source_set()
> +
> common_user_inc += include_directories('.')
>
> bsd_user_ss.add(files(
> @@ -17,3 +19,5 @@ bsd_user_ss.add(files(
>
> # Pull in the OS-specific build glue, if any
> subdir(targetos)
> +
> +specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
> --
> 2.25.1
>
>
