Re: [PATCH v5 16/17] meson: Move linux_user_ss to linux-user/

[Philippe Mathieu-Daudé]

On Wed, Nov 17, 2021 at 6:04 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
> On 11/17/21 5:56 PM, Philippe Mathieu-Daudé wrote:
> > +Thomas/Paolo
> >
> > On 11/17/21 17:04, Richard Henderson wrote:
> >> We have no need to reference linux_user_ss outside of linux-user.
> >> Go ahead and merge it directly into specific_ss.
> >
> > The patch is correct, so:
> >
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> >
> > But ...
> >
> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> >> ---
> >>   meson.build            | 3 ---
> >>   linux-user/meson.build | 4 ++++
> >>   2 files changed, 4 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meson.build b/meson.build
> >> index 9f59c57909..ecc181ea13 100644
> >> --- a/meson.build
> >> +++ b/meson.build
> >> @@ -2363,7 +2363,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()
> >> @@ -2614,8 +2613,6 @@
> >
> > ... shouldn't it be cheaper for the build system to
> > avoid parsing linux-user machinery when we linux-user
> > is disabled, ...
> >
> > + if have_linux_user
> >
> > subdir('linux-user')
> >
> > + endif
>
> We had this discussion before, and settled on
>
> if not have_linux_user
>     subdir_done()
> endif
>
> within linux-user/meson.build.

Indeed sorry. Too much context switching.

> >> +specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
> >
> > ... and add here unconditionally?
>
> Can't do it unconditionally.  We still need to distinguish specific_ss files 
> that are
> CONFIG_USER_ONLY, when building both user-only and sysemu binaries.

Indeed.

> I thought about changing this to CONFIG_USER_ONLY, but thought that would 
> just be a step
> too far for this patch.
>
>
> r~