ninjabackend: Remove duplicate vala compiler usage

pull/814/head
Nirbheek Chauhan 9 years ago
parent 98e7625c64
commit f85415f0d4
  1. 9
      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):

Loading…
Cancel
Save