[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/16] meson: merge plugin_ldflags into emulator_link_args
From: |
Paolo Bonzini |
Subject: |
[PULL 03/16] meson: merge plugin_ldflags into emulator_link_args |
Date: |
Thu, 4 Jul 2024 11:57:53 +0200 |
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>
---
plugins/meson.build | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/plugins/meson.build b/plugins/meson.build
index 51b4350c2a0..18a0303bff9 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,4 +1,3 @@
-plugin_ldflags = []
# Modules need more symbols than just those in plugins/qemu-plugins.symbols
if not enable_modules
if host_os == 'darwin'
@@ -7,9 +6,9 @@ if not enable_modules
output: 'qemu-plugins-ld64.symbols',
capture: true,
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
- 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
@@ -37,5 +36,5 @@ if get_option('plugins')
'loader.c',
'core.c',
'api.c',
- ), declare_dependency(link_args: plugin_ldflags))
+ ))
endif
--
2.45.2
- [PULL 00/16] meson, i386 changes for 2024-07-04, Paolo Bonzini, 2024/07/04
- [PULL 01/16] meson: move shared_module() calls where modules are already walked, Paolo Bonzini, 2024/07/04
- [PULL 02/16] meson: move block.syms dependency out of libblock, Paolo Bonzini, 2024/07/04
- [PULL 03/16] meson: merge plugin_ldflags into emulator_link_args,
Paolo Bonzini <=
- [PULL 04/16] meson: Pass objects and dependencies to declare_dependency(), Paolo Bonzini, 2024/07/04
- [PULL 05/16] Revert "meson: Propagate gnutls dependency", Paolo Bonzini, 2024/07/04
- [PULL 06/16] meson: Drop the .fa library suffix, Paolo Bonzini, 2024/07/04
- [PULL 07/16] target/i386: pass X86CPU to x86_cpu_get_supported_feature_word, Paolo Bonzini, 2024/07/04
- [PULL 08/16] target/i386: drop AMD machine check bits from Intel CPUID, Paolo Bonzini, 2024/07/04
- [PULL 11/16] i386/sev: Fix error message in sev_get_capabilities(), Paolo Bonzini, 2024/07/04
- [PULL 10/16] target/i386: do not include undefined bits in the AMD topoext leaf, Paolo Bonzini, 2024/07/04
- [PULL 13/16] target/i386: add avx-vnni-int16 feature, Paolo Bonzini, 2024/07/04
- [PULL 09/16] target/i386: SEV: fix formatting of CPUID mismatch message, Paolo Bonzini, 2024/07/04
- [PULL 14/16] char-stdio: Restore blocking mode of stdout on exit, Paolo Bonzini, 2024/07/04