diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 22:04:24 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 22:04:24 +0200 |
| commit | d87eb7d2905eaa9ed7bac60945821c7b039298d8 (patch) | |
| tree | 65dd79f54b021f800f258410aca28bb151e0aa48 /mesonbuild/backend/backends.py | |
| parent | 9071c8fc454f5f56060bb979fa3ea01cc61e6ffb (diff) | |
| parent | a405f7a4994d7823b0e4429438e78a6b3dadecdc (diff) | |
| download | meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.zip meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.tar.gz meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.tar.bz2 | |
Merge branch 'base_options'.
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 3a24f30..8d0b0f6 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -203,8 +203,11 @@ class Backend(): if c.can_compile(s): return cpp for c in self.build.compilers: - if c.get_language() != 'vala': - return c + if c.get_language() == 'vala': + continue + for s in src: + if c.can_compile(s): + return c raise RuntimeError('Unreachable code') def determine_ext_objs(self, extobj, proj_dir_to_build_root='', include_dir_names=True): @@ -256,7 +259,7 @@ class Backend(): commands += self.environment.coredata.external_args[compiler.get_language()] commands += target.get_extra_args(compiler.get_language()) commands += compiler.get_buildtype_args(self.environment.coredata.get_builtin_option('buildtype')) - if self.environment.coredata.get_builtin_option('coverage'): + if self.environment.coredata.base_options.get('b_coverage', False): commands += compiler.get_coverage_args() if self.environment.coredata.get_builtin_option('werror'): commands += compiler.get_werror_args() |