diff options
| author | Iñigo MartÃnez <inigomartinez@gmail.com> | 2018-09-17 07:25:33 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-09-28 13:02:13 -0700 |
| commit | ee80620f6501048aef250195c7950656cfad758b (patch) | |
| tree | 02b77a4d2f8f01f5dcea0568e0ac91206f38a650 | |
| parent | 26a5e9a95fe766c253355474c8e6ad97b75549c8 (diff) | |
| download | meson-ee80620f6501048aef250195c7950656cfad758b.zip meson-ee80620f6501048aef250195c7950656cfad758b.tar.gz meson-ee80620f6501048aef250195c7950656cfad758b.tar.bz2 | |
gnome.gtkdoc: Fix static library ldflags
When passing static libraries to gtkdoc, they are also appended as
shared libraries to ldflags, which makes the process to fail.
This has been changed to only append shared libraries to ldflags.
Fixes #3935
| -rw-r--r-- | mesonbuild/modules/gnome.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 45b7eed..1c2f034 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -331,14 +331,15 @@ class GnomeModule(ExtensionModule): for lib in dep.libraries: if hasattr(lib, 'held_object'): lib = lib.held_object - internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath)) - libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath, - use_gir_args, True) - cflags.update(libdepflags[0]) - internal_ldflags.update(libdepflags[1]) - external_ldflags.update(libdepflags[2]) - external_ldflags_nodedup += libdepflags[3] - gi_includes.update(libdepflags[4]) + if isinstance(lib, build.SharedLibrary): + internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath)) + libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath, + use_gir_args, True) + cflags.update(libdepflags[0]) + internal_ldflags.update(libdepflags[1]) + external_ldflags.update(libdepflags[2]) + external_ldflags_nodedup += libdepflags[3] + gi_includes.update(libdepflags[4]) extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath, use_gir_args, True) cflags.update(extdepflags[0]) |