diff options
| -rw-r--r-- | mesonbuild/interpreter.py | 10 | ||||
| -rw-r--r-- | test cases/failing/95 vala without c/meson.build | 2 | ||||
| -rw-r--r-- | test cases/vala/2 multiple files/meson.build | 3 |
3 files changed, 10 insertions, 5 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): diff --git a/test cases/failing/95 vala without c/meson.build b/test cases/failing/95 vala without c/meson.build new file mode 100644 index 0000000..ce39d5d --- /dev/null +++ b/test cases/failing/95 vala without c/meson.build @@ -0,0 +1,2 @@ +project('vala without c') +add_languages('vala') diff --git a/test cases/vala/2 multiple files/meson.build b/test cases/vala/2 multiple files/meson.build index 25ae517..674f10d 100644 --- a/test cases/vala/2 multiple files/meson.build +++ b/test cases/vala/2 multiple files/meson.build @@ -1,4 +1,5 @@ -project('multiple files', 'vala', 'c') +project('multiple files', 'c') +add_languages('vala') glib = dependency('glib-2.0') gobject = dependency('gobject-2.0') |