Re: [PATCH 04/17] configure: clean up handling of CFI option

[Philippe Mathieu-Daudé]

On 16/10/23 11:44, Paolo Bonzini wrote:
> On 10/16/23 11:22, Philippe Mathieu-Daudé wrote:
> > On 16/10/23 08:31, Paolo Bonzini wrote:
> > > Avoid that --enable-cfi --disable-cfi leaves b_lto set to true.
> > >
> > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > > ---
> > >   configure | 7 +++----
> > >   1 file changed, 3 insertions(+), 4 deletions(-)
> >
> >
> > > @@ -1845,6 +1843,7 @@ if test "$skip_meson" = no; then
> > >     # QEMU options
> > >     test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
> > > +  test "$cfi" != false && meson_option_add "-Db_lto=$cfi"
> >
> > Merge as "-Dcfi=$cfi -Db_lto=$cfi"?
>
> Sure, it also needs a little change to meson_option_add though:
>
> diff --git a/configure b/configure
> index 3da46ed202d..fd88ef3fec2 100755
> --- a/configure
> +++ b/configure
> @@ -624,7 +624,10 @@ meson_option_build_array() {
>
>   meson_options=
>   meson_option_add() {
> -  meson_options="$meson_options $(quote_sh "$1")"
> +  local arg
> +  for arg; do
> +    meson_options="$meson_options $(quote_sh "$arg")"
> +  done

Oh I didn't notice. If you had said I wouldn't had insisted,
but since you did the change,

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

>   }
>   meson_option_parse() {
>     meson_options="$meson_options $(_meson_option_parse "$@")"
> @@ -1842,8 +1845,7 @@ if test "$skip_meson" = no; then
>     test "$werror" = yes && meson_option_add -Dwerror=true
>
>     # QEMU options
> -  test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
> -  test "$cfi" != false && meson_option_add "-Db_lto=$cfi"
> +  test "$cfi" != false && meson_option_add "-Dcfi=$cfi" "-Db_lto=$cfi"
>     test "$docs" != auto && meson_option_add "-Ddocs=$docs"
>     test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add 
> "-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
>     test "$plugins" = yes && meson_option_add "-Dplugins=true"
>
> Ok to squash that in?

Certainly.