diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-06 15:07:23 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-07-03 18:41:25 +0200 |
| commit | 0082475e26430297ef65e598db5b67c8ac182620 (patch) | |
| tree | f7f2a94c28f32d6823cb6fdf4ebc7a8f3bedd646 | |
| parent | e8f62689acd5930a712655d0c6838ec5eccc6b1c (diff) | |
| download | qemu-0082475e26430297ef65e598db5b67c8ac182620.zip qemu-0082475e26430297ef65e598db5b67c8ac182620.tar.gz qemu-0082475e26430297ef65e598db5b67c8ac182620.tar.bz2 | |
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>
| -rw-r--r-- | plugins/meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/meson.build b/plugins/meson.build index 51b4350..18a0303 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 |