| Message ID | 20211117111924.179776-1-alex.bennee@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RFC] plugins/meson.build: fix linker issue with weird paths | expand |
Am 17.11.21 um 12:19 schrieb Alex Bennée: > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Fixes: https://gitlab.com/qemu-project/qemu/-/issues/712 > --- > plugins/meson.build | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thank you. The fix works for me and looks fine. meson.project_build_root() was only used there, so hopefully no other code was affected. I tested builds on Debian GNU Linux x86_64 bullseye and latest MacOS and would appreciate if the fix could be applied for release 6.2. Tested-by: Stefan Weil <sw@weilnetz.de> > > diff --git a/plugins/meson.build b/plugins/meson.build > index aeb386ebae..b3de57853b 100644 > --- a/plugins/meson.build > +++ b/plugins/meson.build > @@ -2,9 +2,9 @@ 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=' + (meson.project_build_root() / 'qemu-plugins-ld.symbols')] > + 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,' + (meson.project_build_root() / 'qemu-plugins-ld64.symbols')] > + plugin_ldflags = ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symbols'] > endif > endif >
diff --git a/plugins/meson.build b/plugins/meson.build index aeb386ebae..b3de57853b 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -2,9 +2,9 @@ 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=' + (meson.project_build_root() / 'qemu-plugins-ld.symbols')] + 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,' + (meson.project_build_root() / 'qemu-plugins-ld64.symbols')] + plugin_ldflags = ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symbols'] endif endif
Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Fixes: https://gitlab.com/qemu-project/qemu/-/issues/712 --- plugins/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)