aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-30 21:27:02 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-30 21:27:02 +0300
commit74265135bddd7dfe714a65e92f84c742273fbfef (patch)
tree617008de908651279a02baf00da200ab4e33fa54 /mesonbuild/backend/ninjabackend.py
parentf3386d10c3406f0135b040e7f08cc5e290c20219 (diff)
downloadmeson-74265135bddd7dfe714a65e92f84c742273fbfef.zip
meson-74265135bddd7dfe714a65e92f84c742273fbfef.tar.gz
meson-74265135bddd7dfe714a65e92f84c742273fbfef.tar.bz2
Add global arguments to vala compilations.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index f5c992c..3d83427 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -233,7 +233,8 @@ int dummy;
self.generate_cs_target(target, outfile)
return
if 'vala' in self.environment.coredata.compilers.keys() and self.has_vala(target):
- vala_output_files = self.generate_vala_compile(target, outfile)
+ vc = self.environment.coredata.compilers['vala']
+ vala_output_files = self.generate_vala_compile(vc, target, outfile)
gen_src_deps += vala_output_files
if 'swift' in self.environment.coredata.compilers.keys() and self.has_swift(target):
self.generate_swift_target(target, outfile)
@@ -788,7 +789,7 @@ int dummy;
break
return result
- def generate_vala_compile(self, target, outfile):
+ def generate_vala_compile(self, compiler, target, outfile):
"""Vala is compiled into C. Set up all necessary build steps here."""
valac = self.environment.coredata.compilers['vala']
(src, vapi_src) = self.split_vala_sources(target.get_sources())
@@ -808,7 +809,9 @@ int dummy;
generated_c_files = []
outputs = [vapiname]
- args = ['-d', self.get_target_private_dir(target)]
+ args = []
+ args += self.build.get_global_args(compiler)
+ args += ['-d', self.get_target_private_dir(target)]
args += ['-C']#, '-o', cname]
if not isinstance(target, build.Executable):
outputs.append(hname)