diff options
| author | James Westman <flyingpimonster@flyingpimonster.net> | 2019-06-24 12:04:12 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-27 21:28:54 +0300 |
| commit | 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d (patch) | |
| tree | bf8a10d22a6b467b616f731be972752c3ce61035 /mesonbuild/backend/ninjabackend.py | |
| parent | 9149aaba9c87250a7fc92686c37057038f57ef99 (diff) | |
| download | meson-77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d.zip meson-77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d.tar.gz meson-77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 |
1 files changed, 1 insertions, 2 deletions
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) |