From 46459dc8b2aa52f9b82950f51d7e246706227ee3 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 7 Apr 2019 15:52:41 -0400 Subject: [PATCH] OK then, it's a meson bug. Also -win32 doesn't have C++11 threads :| --- azure-pipelines/cross-386-mingw.txt | 8 +++----- azure-pipelines/install-latest-meson.yml | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines/cross-386-mingw.txt b/azure-pipelines/cross-386-mingw.txt index c980dd16..4e5b5b49 100644 --- a/azure-pipelines/cross-386-mingw.txt +++ b/azure-pipelines/cross-386-mingw.txt @@ -1,15 +1,13 @@ [binaries] -c = '/usr/bin/i686-w64-mingw32-gcc-win32' -cpp = '/usr/bin/i686-w64-mingw32-g++-win32' -ar = '/usr/bin/i686-w64-mingw32-gcc-ar-win32' +c = '/usr/bin/i686-w64-mingw32-gcc' +cpp = '/usr/bin/i686-w64-mingw32-g++' +ar = '/usr/bin/i686-w64-mingw32-gcc-ar' strip = '/usr/bin/i686-w64-mingw32-strip' pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config' windres = '/usr/bin/i686-w64-mingw32-windres' [properties] root = '/usr/i686-w64-mingw32' -c_args = ['--std=c99'] -cpp_args = ['--std=c++11'] [host_machine] system = 'windows' diff --git a/azure-pipelines/install-latest-meson.yml b/azure-pipelines/install-latest-meson.yml index 4c86a01e..588bd9d7 100644 --- a/azure-pipelines/install-latest-meson.yml +++ b/azure-pipelines/install-latest-meson.yml @@ -3,5 +3,6 @@ steps: - script: | python -m pip install --upgrade pip setuptools wheel - pip install meson + # 0.50.0 has a bug that prevents cross-builds (like our MinGW-w64 build) to not work properly + pip install 'meson!=0.50.0' displayName: 'Install Latest Meson'