diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-09-25 11:24:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-09-27 00:27:38 +0530 |
| commit | f85415f0d4617a5f176c4b7f27f04568027184fe (patch) | |
| tree | abb01fe3d93023c1527f31de84f1ad1b36d933e6 | |
| parent | 98e7625c64a8da8e66c7a48ca9180630036fe3e8 (diff) | |
| download | meson-f85415f0d4617a5f176c4b7f27f04568027184fe.zip meson-f85415f0d4617a5f176c4b7f27f04568027184fe.tar.gz meson-f85415f0d4617a5f176c4b7f27f04568027184fe.tar.bz2 | |
ninjabackend: Remove duplicate vala compiler usage
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 251f7ee..1ef4eff 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -240,8 +240,7 @@ int dummy; self.generate_cs_target(target, outfile) return if 'vala' in self.environment.coredata.compilers.keys() and self.has_vala(target): - vc = self.environment.coredata.compilers['vala'] - vala_output_files = self.generate_vala_compile(vc, target, outfile) + vala_output_files = self.generate_vala_compile(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) @@ -845,7 +844,7 @@ int dummy; break return result - def generate_vala_compile(self, compiler, target, outfile): + def generate_vala_compile(self, 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()) @@ -866,8 +865,8 @@ int dummy; generated_c_files = [] outputs = [vapiname] args = [] - args += self.build.get_global_args(compiler) - args += compiler.get_buildtype_args(self.environment.coredata.get_builtin_option('buildtype')) + args += self.build.get_global_args(valac) + args += valac.get_buildtype_args(self.environment.coredata.get_builtin_option('buildtype')) args += ['-d', self.get_target_private_dir(target)] args += ['-C']#, '-o', cname] if not isinstance(target, build.Executable): |