aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-07-02 12:13:23 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-07-02 12:14:03 +0300
commit1476af4ada29a452f128470a50e9e5de2895dfff (patch)
treed1a674be0dda2ea0b2f46e9f624ed873ea6e2a15
parent19ae286aff8827bcc2334dc3daf4e60bba6f32ab (diff)
downloadmeson-1476af4ada29a452f128470a50e9e5de2895dfff.zip
meson-1476af4ada29a452f128470a50e9e5de2895dfff.tar.gz
meson-1476af4ada29a452f128470a50e9e5de2895dfff.tar.bz2
vala: don't ignore vala_args. Closes #192
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--build.py5
-rw-r--r--ninjabackend.py1
2 files changed, 6 insertions, 0 deletions
diff --git a/build.py b/build.py
index ffd8fb9..4b233b8 100644
--- a/build.py
+++ b/build.py
@@ -25,6 +25,7 @@ known_basic_kwargs = {'install' : True,
'c_args' : True,
'cpp_args' : True,
'cs_args' : True,
+ 'vala_args' : True,
'link_args' : True,
'link_depends': True,
'link_with' : True,
@@ -299,6 +300,10 @@ class BuildTarget():
if not isinstance(cslist, list):
cslist = [cslist]
self.add_compiler_args('cs', cslist)
+ valalist = kwargs.get('vala_args', [])
+ if not isinstance(valalist, list):
+ valalist = [valalist]
+ self.add_compiler_args('vala', valalist)
self.link_args = kwargs.get('link_args', [])
if not isinstance(self.link_args, list):
self.link_args = [self.link_args]
diff --git a/ninjabackend.py b/ninjabackend.py
index 34f6b18..153758c 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -711,6 +711,7 @@ class NinjaBackend(backends.Backend):
if isinstance(d, dependencies.PkgConfigDependency):
args += ['--pkg', d.name]
args += vapi_src
+ args += target.extra_args.get('vala', [])
generated_c += [relsc]
element = NinjaBuildElement(relsc, valac.get_language() + '_COMPILER', rel_s)
element.add_item('ARGS', args)