diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-17 22:15:32 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-17 22:15:32 +0200 |
| commit | 53e90acda9dc4f9740dbf1a9f368ffa38532007f (patch) | |
| tree | fe5fc8561a06b34ba38868035b7fbee35e10bd57 | |
| parent | deff35eef60223b5df6497e61e0cdcf1ad81f09f (diff) | |
| download | meson-53e90acda9dc4f9740dbf1a9f368ffa38532007f.tar.gz | |
Fix Vala cross compilation. Closes #370.
| -rw-r--r-- | cross/ubuntu-mingw.txt | 1 | ||||
| -rw-r--r-- | mesonbuild/compilers.py | 1 |
2 files changed, 2 insertions, 0 deletions
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) |