Revert d9473095f2 because it broke GStreamer.

8 years ago · 3c48bd2d88
parent caa1ef6318
commit 3c48bd2d88
1 changed files with 5 additions and 2 deletions
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@ -381,8 +381,11 @@ class GnomeModule:
            deps = [deps]
        deps = (girtarget.get_all_link_deps() + girtarget.get_external_deps() +
                deps)
-        cflags, _, gi_includes = self.get_dependencies_flags(deps, state, depends)
-        scan_command += list(cflags)
+        # ldflags will be misinterpreted by gir scanner (showing
+        # spurious dependencies) but building GStreamer fails if they
+        # are not used here.
+        cflags, ldflags, gi_includes = self.get_dependencies_flags(deps, state, depends)
+        scan_command += list(cflags) + list(ldflags)
        for i in gi_includes:
            scan_command += ['--add-include-path=%s' % i]