| Message ID | 20210122204441.2145197-9-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | buildsys: Do not build various objects if not necessary | expand |
On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Cc: Richard Henderson <richard.henderson@linaro.org> > --- > meson.build | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/meson.build b/meson.build > index 396ea3aa19b..b5afa2923b3 100644 > --- a/meson.build > +++ b/meson.build > @@ -1809,16 +1809,18 @@ > qemuutil = declare_dependency(link_with: libqemuutil, > sources: genh + version_res) > > -decodetree = generator(find_program('scripts/decodetree.py'), > - output: 'decode-@BASENAME@.c.inc', > - arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) > +if have_system or have_user Maybe better as: if not get_option('tcg').disabled() And even clearer as: if get_option('tcg').enabled() assuming enabled would be "auto" or "yes". > + decodetree = generator(find_program('scripts/decodetree.py'), > + output: 'decode-@BASENAME@.c.inc', > + arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) > + subdir('libdecnumber') > + subdir('target') > +endif > > subdir('audio') > subdir('io') > subdir('chardev') > subdir('fsdev') > -subdir('libdecnumber') > -subdir('target') > subdir('dump') > > block_ss.add(files( >
On 1/25/21 4:09 PM, Philippe Mathieu-Daudé wrote: > On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> Cc: Richard Henderson <richard.henderson@linaro.org> >> --- >> meson.build | 12 +++++++----- >> 1 file changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/meson.build b/meson.build >> index 396ea3aa19b..b5afa2923b3 100644 >> --- a/meson.build >> +++ b/meson.build >> @@ -1809,16 +1809,18 @@ >> qemuutil = declare_dependency(link_with: libqemuutil, >> sources: genh + version_res) >> >> -decodetree = generator(find_program('scripts/decodetree.py'), >> - output: 'decode-@BASENAME@.c.inc', >> - arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) >> +if have_system or have_user > > Maybe better as: > > if not get_option('tcg').disabled() > > And even clearer as: > > if get_option('tcg').enabled() > > assuming enabled would be "auto" or "yes". ^ this comment is only for the decodetree generator, not for the target/ directory ;) > >> + decodetree = generator(find_program('scripts/decodetree.py'), >> + output: 'decode-@BASENAME@.c.inc', >> + arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) >> + subdir('libdecnumber') >> + subdir('target') >> +endif >> >> subdir('audio') >> subdir('io') >> subdir('chardev') >> subdir('fsdev') >> -subdir('libdecnumber') >> -subdir('target') >> subdir('dump') >> >> block_ss.add(files( >> >
diff --git a/meson.build b/meson.build index 396ea3aa19b..b5afa2923b3 100644 --- a/meson.build +++ b/meson.build @@ -1809,16 +1809,18 @@ qemuutil = declare_dependency(link_with: libqemuutil, sources: genh + version_res) -decodetree = generator(find_program('scripts/decodetree.py'), - output: 'decode-@BASENAME@.c.inc', - arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) +if have_system or have_user + decodetree = generator(find_program('scripts/decodetree.py'), + output: 'decode-@BASENAME@.c.inc', + arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) + subdir('libdecnumber') + subdir('target') +endif subdir('audio') subdir('io') subdir('chardev') subdir('fsdev') -subdir('libdecnumber') -subdir('target') subdir('dump') block_ss.add(files(
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- Cc: Richard Henderson <richard.henderson@linaro.org> --- meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)