diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-03 22:22:31 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-03 23:40:01 +0300 |
commit | cb9344cb8d32641aa2db11709db0ce89a5525c8c (patch) | |
tree | c72016789f9590770f7e31fea874f1a2ba69953a | |
parent | 3a2e333f004828e5390ce96344cb338be11e70b0 (diff) | |
download | meson-cb9344cb8d32641aa2db11709db0ce89a5525c8c.zip meson-cb9344cb8d32641aa2db11709db0ce89a5525c8c.tar.gz meson-cb9344cb8d32641aa2db11709db0ce89a5525c8c.tar.bz2 |
Revert "gnome: Use --pkg to pass pkg-config cflags to g-ir-scanner"
This reverts commit 3a2e333f004828e5390ce96344cb338be11e70b0.
-rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0c4b67a..b8092b2 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -332,10 +332,7 @@ class GnomeModule(ExtensionModule): source.held_object.get_subdir())]) # This should be any dependency other than an internal one. elif isinstance(dep, Dependency): - if isinstance(dep, PkgConfigDependency) and use_gir_args: - cflags.update(["--pkg=%s" % dep.get_name()]) - else: - cflags.update(dep.get_compile_args()) + cflags.update(dep.get_compile_args()) for lib in dep.get_link_args(): if (os.path.isabs(lib) and # For PkgConfigDependency only: |