From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00 2001 From: James Westman Date: Mon, 24 Jun 2019 12:04:12 -0500 Subject: Fix two errors when cross-compiling with Vala - AttributeError: 'ValaCompiler' object has no attribute 'get_program_dirs' Fixed by adding a `get_program_dirs()` function to the base Compiler class, to match `get_library_dirs()` - KeyError: 'vala_COMPILER' Fixed by creating the Vala compile rules for all machines, not just the build machine. --- mesonbuild/backend/ninjabackend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a454e6a..b830e37 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1653,8 +1653,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) self.generate_cs_compile_rule(compiler) return if langname == 'vala': - if self.environment.machines.matches_build_machine(compiler.for_machine): - self.generate_vala_compile_rules(compiler) + self.generate_vala_compile_rules(compiler) return if langname == 'rust': self.generate_rust_compile_rules(compiler) -- cgit v1.1