Message ID | 20211007130829.632254-7-pbonzini@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | configure->meson queue for 6.2 | expand |
On Thu, Oct 7, 2021 at 5:24 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > configure | 3 --- > meson.build | 1 + > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/configure b/configure > index 35e25bb960..499c84859d 100755 > --- a/configure > +++ b/configure > @@ -4628,9 +4628,6 @@ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak > echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak > echo "EXESUF=$EXESUF" >> $config_host_mak > echo "LIBS_QGA=$libs_qga" >> $config_host_mak > -if test "$gcov" = "yes" ; then > - echo "CONFIG_GCOV=y" >> $config_host_mak > -fi > > if test "$rng_none" = "yes"; then > echo "CONFIG_RNG_NONE=y" >> $config_host_mak > diff --git a/meson.build b/meson.build > index 9bb443387a..2962c24eb5 100644 > --- a/meson.build > +++ b/meson.build > @@ -1404,6 +1404,7 @@ config_host_data.set('CONFIG_ATTR', libattr.found()) > config_host_data.set('CONFIG_BRLAPI', brlapi.found()) > config_host_data.set('CONFIG_COCOA', cocoa.found()) > config_host_data.set('CONFIG_FUZZ', get_option('fuzzing')) > +config_host_data.set('CONFIG_GCOV', get_option('b_coverage')) > config_host_data.set('CONFIG_LIBUDEV', libudev.found()) > config_host_data.set('CONFIG_LZO', lzo.found()) > config_host_data.set('CONFIG_MPATH', mpathpersist.found()) > -- > 2.31.1 > > > >
diff --git a/configure b/configure index 35e25bb960..499c84859d 100755 --- a/configure +++ b/configure @@ -4628,9 +4628,6 @@ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak echo "LIBS_QGA=$libs_qga" >> $config_host_mak -if test "$gcov" = "yes" ; then - echo "CONFIG_GCOV=y" >> $config_host_mak -fi if test "$rng_none" = "yes"; then echo "CONFIG_RNG_NONE=y" >> $config_host_mak diff --git a/meson.build b/meson.build index 9bb443387a..2962c24eb5 100644 --- a/meson.build +++ b/meson.build @@ -1404,6 +1404,7 @@ config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_FUZZ', get_option('fuzzing')) +config_host_data.set('CONFIG_GCOV', get_option('b_coverage')) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) config_host_data.set('CONFIG_LZO', lzo.found()) config_host_data.set('CONFIG_MPATH', mpathpersist.found())
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- configure | 3 --- meson.build | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)