diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-24 21:16:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 21:16:22 +0300 |
| commit | cad020f9da4d52e52577926570b68bf9decef4ca (patch) | |
| tree | de66734127764c753a2a79896a302e1ee5f91efd /mesonbuild/modules/gnome.py | |
| parent | 90c7b5ea58c7d1fea83236cd05b0680dc1c52cac (diff) | |
| parent | 44dc02849995188f8b25158d2c71009aeb264910 (diff) | |
| download | meson-cad020f9da4d52e52577926570b68bf9decef4ca.zip meson-cad020f9da4d52e52577926570b68bf9decef4ca.tar.gz meson-cad020f9da4d52e52577926570b68bf9decef4ca.tar.bz2 | |
Merge pull request #2243 from thiblahute/csharp
Patchset to allow using meson for gstreamer-sharp
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0a39664..1632dae 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -375,8 +375,6 @@ class GnomeModule(ExtensionModule): # Hack to avoid passing some compiler options in if lib.startswith("-W"): continue - if gir_has_extra_lib_arg() and use_gir_args and lib.startswith("-l"): - lib = lib.replace('-l', '--extra-library=', 1) ldflags.update([lib]) if isinstance(dep, PkgConfigDependency): @@ -389,6 +387,14 @@ class GnomeModule(ExtensionModule): mlog.log('dependency %s not handled to build gir files' % dep) continue + if gir_has_extra_lib_arg() and use_gir_args: + fixed_ldflags = set() + for ldflag in ldflags: + if ldflag.startswith("-l"): + fixed_ldflags.add(ldflag.replace('-l', '--extra-library=', 1)) + else: + fixed_ldflags.add(ldflag) + ldflags = fixed_ldflags return cflags, ldflags, gi_includes @permittedKwargs({'sources', 'nsversion', 'namespace', 'symbol_prefix', 'identifier_prefix', |