| Message ID | 20230607090336.59424-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | meson: fix "static build" entry in summary | expand |
On 7/6/23 11:03, Paolo Bonzini wrote: > Fixes: a0cbd2e8496 ("meson: use prefer_static option", 2023-05-18) > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 553c8e0b9c5..34d0444ffbb 100644 > --- a/meson.build > +++ b/meson.build > @@ -4088,7 +4088,7 @@ summary_info += {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} > summary_info += {'profiler': get_option('profiler')} > summary_info += {'link-time optimization (LTO)': get_option('b_lto')} > summary_info += {'PIE': get_option('b_pie')} > -summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} > +summary_info += {'static build': get_optin('prefer_static')} Typo 'get_option'. > summary_info += {'malloc trim support': has_malloc_trim} > summary_info += {'membarrier': have_membarrier} > summary_info += {'debug graph lock': get_option('debug_graph_lock')}
On Wed, Jun 7, 2023 at 11:09 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > On 7/6/23 11:03, Paolo Bonzini wrote: > > Fixes: a0cbd2e8496 ("meson: use prefer_static option", 2023-05-18) > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > --- > > meson.build | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meson.build b/meson.build > > index 553c8e0b9c5..34d0444ffbb 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -4088,7 +4088,7 @@ summary_info += {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} > > summary_info += {'profiler': get_option('profiler')} > > summary_info += {'link-time optimization (LTO)': get_option('b_lto')} > > summary_info += {'PIE': get_option('b_pie')} > > -summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} > > +summary_info += {'static build': get_optin('prefer_static')} > > Typo 'get_option'. Yeah, sent after testing but before committing the obvious fix. :( Paolo > > summary_info += {'malloc trim support': has_malloc_trim} > > summary_info += {'membarrier': have_membarrier} > > summary_info += {'debug graph lock': get_option('debug_graph_lock')} >
On 7/6/23 11:26, Paolo Bonzini wrote: > On Wed, Jun 7, 2023 at 11:09 AM Philippe Mathieu-Daudé > <philmd@linaro.org> wrote: >> >> On 7/6/23 11:03, Paolo Bonzini wrote: >>> Fixes: a0cbd2e8496 ("meson: use prefer_static option", 2023-05-18) >>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >>> --- >>> meson.build | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/meson.build b/meson.build >>> index 553c8e0b9c5..34d0444ffbb 100644 >>> --- a/meson.build >>> +++ b/meson.build >>> @@ -4088,7 +4088,7 @@ summary_info += {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} >>> summary_info += {'profiler': get_option('profiler')} >>> summary_info += {'link-time optimization (LTO)': get_option('b_lto')} >>> summary_info += {'PIE': get_option('b_pie')} >>> -summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} >>> +summary_info += {'static build': get_optin('prefer_static')} >> >> Typo 'get_option'. > > Yeah, sent after testing but before committing the obvious fix. :( So with the typo fixed: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> :)
diff --git a/meson.build b/meson.build index 553c8e0b9c5..34d0444ffbb 100644 --- a/meson.build +++ b/meson.build @@ -4088,7 +4088,7 @@ summary_info += {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} summary_info += {'profiler': get_option('profiler')} summary_info += {'link-time optimization (LTO)': get_option('b_lto')} summary_info += {'PIE': get_option('b_pie')} -summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} +summary_info += {'static build': get_optin('prefer_static')} summary_info += {'malloc trim support': has_malloc_trim} summary_info += {'membarrier': have_membarrier} summary_info += {'debug graph lock': get_option('debug_graph_lock')}
Fixes: a0cbd2e8496 ("meson: use prefer_static option", 2023-05-18) Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)