From c138156ba55cd7e1b8b45a0e49f62f97d92a9e64 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 2 Sep 2020 06:30:40 -0400 Subject: meson: fix libqos linking Add genh to the sources to avoid race conditions between QAPI file generation and libqos compilation. Make the name_suffix .fa for consistency with other link_whole static libraries and to work around a Meson issue where lots of linker flags are placed between -Wl,--start-group and -Wl,--end-group and this breaks the fork-fuzz.ld linker script. Reported-by: Claudio Fontana Reported-by: Alexander Bulekov Signed-off-by: Paolo Bonzini --- tests/qtest/libqos/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/qtest') diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index 19931b9248..1cddf5bdaa 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -1,5 +1,4 @@ -libqos = static_library('qos', - files('../libqtest.c', +libqos_srcs = files('../libqtest.c', 'qgraph.c', 'qos_external.c', 'pci.c', @@ -52,6 +51,10 @@ libqos = static_library('qos', 'arm-xilinx-zynq-a9-machine.c', 'ppc64_pseries-machine.c', 'x86_64_pc-machine.c', -), build_by_default: false) +) + +libqos = static_library('qos', libqos_srcs + genh, + name_suffix: 'fa', + build_by_default: false) qos = declare_dependency(link_whole: libqos) -- cgit v1.2.3-55-g7522