From 53e90acda9dc4f9740dbf1a9f368ffa38532007f Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 17 Feb 2016 22:15:32 +0200 Subject: [PATCH] Fix Vala cross compilation. Closes #370. --- cross/ubuntu-mingw.txt | 1 + mesonbuild/compilers.py | 1 + 2 files changed, 2 insertions(+) diff --git a/cross/ubuntu-mingw.txt b/cross/ubuntu-mingw.txt index 23735654d..4c8fcac41 100644 --- a/cross/ubuntu-mingw.txt +++ b/cross/ubuntu-mingw.txt @@ -7,6 +7,7 @@ c = '/usr/bin/i686-w64-mingw32-gcc' cpp = '/usr/bin/i686-w64-mingw32-g++' ar = '/usr/bin/i686-w64-mingw32-ar' strip = '/usr/bin/i686-w64-mingw32-strip' +pkgconfig = '/usr/bin/mingw32-pkg-config' [properties] root = '/usr/i686-w64-mingw32' diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 7cf152f5b..1a51e2167 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -899,6 +899,7 @@ class ValaCompiler(Compiler): self.version = version self.id = 'unknown' self.language = 'vala' + self.is_cross = False def name_string(self): return ' '.join(self.exelist)