diff options
| author | Paolo Bonzini | 2021-12-10 09:55:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2022-01-12 14:09:06 +0100 |
| commit | 37650689473c4cdb5838f90cbc1aefbcd9332fb0 (patch) | |
| tree | aff84d9330c26fa9812bcaf531d694a98d94e37f /plugins | |
| parent | block/file-posix: Simplify the XFS_IOC_DIOINFO handling (diff) | |
| download | qemu-37650689473c4cdb5838f90cbc1aefbcd9332fb0.tar.gz qemu-37650689473c4cdb5838f90cbc1aefbcd9332fb0.tar.xz qemu-37650689473c4cdb5838f90cbc1aefbcd9332fb0.zip | |
configure: simplify creation of plugin symbol list
--dynamic-list is present on all supported ELF (not Windows or Darwin)
platforms, since it dates back to 2006; -exported_symbols_list is
likewise present on all supported versions of macOS. Do not bother
doing a functional test in configure.
Remove the file creation from configure as well: for Darwin, move the
the creation of the Darwin-formatted symbols to meson; for ELF, use the
file in the source path directly and switch from -Wl, to -Xlinker to
not break weird paths that include a comma.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/meson.build | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/plugins/meson.build b/plugins/meson.build index b3de57853b..fa12047327 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,10 +1,15 @@ plugin_ldflags = [] # Modules need more symbols than just those in plugins/qemu-plugins.symbols if not enable_modules - if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags = ['-Wl,--dynamic-list=qemu-plugins-ld.symbols'] - elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host - plugin_ldflags = ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symbols'] + if targetos == 'darwin' + qemu_plugins_symbols_list = configure_file( + input: files('qemu-plugins.symbols'), + 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'] + else + plugin_ldflags = ['-Xlinker', '--dynamic-list=' + (meson.project_source_root() / 'plugins/qemu-plugins.symbols')] endif endif |