diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-09-07 19:23:49 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-09-13 13:56:26 +0200 |
| commit | d051d0e14c7a0b198d41694a4e20f0bc5ae76048 (patch) | |
| tree | 0dd9a8fc8d7d58dd60f25e5cc4246a368a6fb43c | |
| parent | 95e2289fdac8e329f3282e943715e2a5c4e3177b (diff) | |
| download | qemu-d051d0e14c7a0b198d41694a4e20f0bc5ae76048.zip qemu-d051d0e14c7a0b198d41694a4e20f0bc5ae76048.tar.gz qemu-d051d0e14c7a0b198d41694a4e20f0bc5ae76048.tar.bz2 | |
meson: look up cp and dtrace with find_program()
Avoid that meson prints a "Program xyz found" test once per
custom_target.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | pc-bios/keymaps/meson.build | 3 | ||||
| -rw-r--r-- | trace/meson.build | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index 05eda6c..44247a1 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -38,6 +38,7 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host else native_qemu_keymap = qemu_keymap endif +cp = find_program('cp') t = [] foreach km, args: keymaps @@ -55,7 +56,7 @@ foreach km, args: keymaps build_by_default: true, input: km, output: km, - command: ['cp', '@INPUT@', '@OUTPUT@'], + command: [cp, '@INPUT@', '@OUTPUT@'], install: true, install_dir: qemu_datadir / 'keymaps') endif diff --git a/trace/meson.build b/trace/meson.build index ef18f11..e401e7c 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -2,6 +2,7 @@ specific_ss.add(files('control-target.c')) trace_events_files = [] +dtrace = find_program('dtrace', required: 'CONFIG_TRACE_DTRACE' in config_host) foreach dir : [ '.' ] + trace_events_subdirs trace_events_file = meson.source_root() / dir / 'trace-events' trace_events_files += [ trace_events_file ] @@ -39,13 +40,13 @@ foreach dir : [ '.' ] + trace_events_subdirs trace_dtrace_h = custom_target(fmt.format('trace-dtrace', 'h'), output: fmt.format('trace-dtrace', 'h'), input: trace_dtrace, - command: [ 'dtrace', '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ]) + command: [ dtrace, '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ]) trace_ss.add(trace_dtrace_h) if host_machine.system() != 'darwin' trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'), output: fmt.format('trace-dtrace', 'o'), input: trace_dtrace, - command: [ 'dtrace', '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ]) + command: [ dtrace, '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ]) trace_ss.add(trace_dtrace_o) endif |