diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-12-12 16:01:23 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-22 20:04:50 +0200 |
| commit | 8a9e1b11661eb48c51bf7291eb16b054ca60d5c4 (patch) | |
| tree | bfb4b9a86448cc521727afce18a543c12d90e680 /mesonbuild/interpreter.py | |
| parent | 3a613564d3f2db35ca03b2b8658f7050f5ed56d7 (diff) | |
| download | meson-8a9e1b11661eb48c51bf7291eb16b054ca60d5c4.zip meson-8a9e1b11661eb48c51bf7291eb16b054ca60d5c4.tar.gz meson-8a9e1b11661eb48c51bf7291eb16b054ca60d5c4.tar.bz2 | |
Disallow add_languages('vala') without 'c'
v2:
Exercise add_lanagues('vala') after 'c' in a test case
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 08f10a2..1e094dd 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2628,10 +2628,6 @@ external dependencies (including libraries) must go to "dependencies".''') mlog.log('Project name:', mlog.bold(proj_name)) mlog.log('Project version:', mlog.bold(self.project_version)) self.add_languages(proj_langs, True) - langs = self.coredata.compilers.keys() - if 'vala' in langs: - if 'c' not in langs: - raise InterpreterException('Compiling Vala requires C. Add C to your project languages and rerun Meson.') if not self.is_subproject(): self.check_cross_stdlibs() @@ -2720,6 +2716,12 @@ external dependencies (including libraries) must go to "dependencies".''') mlog.log('Cross', cross_comp.get_display_language(), 'compiler:', mlog.bold(' '.join(cross_comp.get_exelist())), version_string) self.build.ensure_static_cross_linker(cross_comp) + + langs = self.coredata.compilers.keys() + if 'vala' in langs: + if 'c' not in langs: + raise InterpreterException('Compiling Vala requires C. Add C to your project languages and rerun Meson.') + return success def program_from_file_for(self, for_machine, prognames, silent): |