aboutsummaryrefslogtreecommitdiff
path: root/ninjabackend.py
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-07-02 11:38:58 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-07-02 11:38:58 +0300
commit919d958485c9978489eee37d84aee6ad4caa1fbd (patch)
treeb704a4c2b29bc8352987fb767101e0d8c9ac404c /ninjabackend.py
parentd7ca9eee5a5960a63fdf70edea119afb1db962fc (diff)
downloadmeson-919d958485c9978489eee37d84aee6ad4caa1fbd.zip
meson-919d958485c9978489eee37d84aee6ad4caa1fbd.tar.gz
meson-919d958485c9978489eee37d84aee6ad4caa1fbd.tar.bz2
vala: use --target-glib only if >=, == specified
it does changes to generated code to drop deprecated functions, so we can get unexpected errors Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'ninjabackend.py')
-rw-r--r--ninjabackend.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py
index 694b776..21d3944 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -709,8 +709,9 @@ class NinjaBackend(backends.Backend):
args += valac.get_werror_args()
for d in target.external_deps:
if isinstance(d, dependencies.PkgConfigDependency):
- if d.name == 'glib-2.0' and d.version_requirement is not None:
- args += ['--target-glib', d.version_requirement[2:]]
+ if d.name == 'glib-2.0' and d.version_requirement is not None \
+ and d.version_requirement.startswith(('>=', '==')):
+ args += ['--target-glib', d.version_requirement[2:]]
args += ['--pkg', d.name]
args += vapi_src
generated_c += [relsc]