meson: merge plugin_ldflags into emulator_link_args

These serve the same purpose, except plugin_ldflags ends up in the linker
command line in a more roundabout way (through specific_ss).  Simplify.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-06-06 15:07:23 +02:00
parent e8f62689ac
commit 0082475e26

View File

@ -1,4 +1,3 @@
plugin_ldflags = []
# Modules need more symbols than just those in plugins/qemu-plugins.symbols # Modules need more symbols than just those in plugins/qemu-plugins.symbols
if not enable_modules if not enable_modules
if host_os == 'darwin' if host_os == 'darwin'
@ -7,9 +6,9 @@ if not enable_modules
output: 'qemu-plugins-ld64.symbols', output: 'qemu-plugins-ld64.symbols',
capture: true, capture: true,
command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@INPUT@']) command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@INPUT@'])
plugin_ldflags = ['-Wl,-exported_symbols_list,plugins/qemu-plugins-ld64.symbols'] emulator_link_args += ['-Wl,-exported_symbols_list,plugins/qemu-plugins-ld64.symbols']
else else
plugin_ldflags = ['-Xlinker', '--dynamic-list=' + (meson.project_source_root() / 'plugins/qemu-plugins.symbols')] emulator_link_args += ['-Xlinker', '--dynamic-list=' + (meson.project_source_root() / 'plugins/qemu-plugins.symbols')]
endif endif
endif endif
@ -37,5 +36,5 @@ if get_option('plugins')
'loader.c', 'loader.c',
'core.c', 'core.c',
'api.c', 'api.c',
), declare_dependency(link_args: plugin_ldflags)) ))
endif endif