[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/17] meson: Don't make object files for dtrace on macOS
From: |
Paolo Bonzini |
Subject: |
[PULL 03/17] meson: Don't make object files for dtrace on macOS |
Date: |
Thu, 27 Aug 2020 12:59:42 -0400 |
From: Roman Bolshakov <r.bolshakov@yadro.com>
dtrace on macOS uses unresolved symbols with a special prefix to define
probes [1], only headers should be generated for USDT (dtrace(1)). But
it doesn't support backwards compatible no-op -G flag [2] and implicit
build rules fail.
1. https://markmail.org/message/6grq2ygr5nwdwsnb
2. https://markmail.org/message/5xrxt2w5m42nojkz
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
trace/meson.build | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/trace/meson.build b/trace/meson.build
index 56e870848e..1c1fb31a61 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -39,12 +39,15 @@ foreach dir : [ '.' ] + trace_events_subdirs
output: fmt.format('trace-dtrace', 'h'),
input: trace_dtrace,
command: [ 'dtrace', '-o', '@OUTPUT@',
'-h', '-s', '@INPUT@' ])
- trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
- output: fmt.format('trace-dtrace', 'o'),
- input: trace_dtrace,
- command: [ 'dtrace', '-o', '@OUTPUT@',
'-G', '-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', '-o', '@OUTPUT@',
'-G', '-s', '@INPUT@' ])
+ trace_ss.add(trace_dtrace_o)
+ endif
- trace_ss.add(trace_dtrace_h, trace_dtrace_o)
genh += trace_dtrace_h
endif
endforeach
--
2.26.2
- [PULL 00/17] Meson fixes for 2020-08-27, Paolo Bonzini, 2020/08/27
- [PULL 03/17] meson: Don't make object files for dtrace on macOS,
Paolo Bonzini <=
- [PULL 04/17] scripts/qemu-version.sh: Add missing space before ']', Paolo Bonzini, 2020/08/27
- [PULL 08/17] meson: move pixman detection to meson, Paolo Bonzini, 2020/08/27
- [PULL 10/17] configure: add --ninja option, Paolo Bonzini, 2020/08/27
- [PULL 11/17] meson: cleanup xkbcommon detection, Paolo Bonzini, 2020/08/27
- [PULL 06/17] meson: Fix chardev-baum.so name, Paolo Bonzini, 2020/08/27
- [PULL 05/17] meson: Fix meson build with --enable-libdaxctl, Paolo Bonzini, 2020/08/27
- [PULL 09/17] meson: skip SDL2 detection if --disable-system, Paolo Bonzini, 2020/08/27
- [PULL 16/17] meson: set colorout to auto, Paolo Bonzini, 2020/08/27
- [PULL 15/17] meson: Mingw64 gcc doesn't recognize system include_type for sdl2, Paolo Bonzini, 2020/08/27
- [PULL 13/17] ninjatool: quote dollars in variables, Paolo Bonzini, 2020/08/27