From c21d47836cd73def920183633e326e337eee57b4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 24 Jun 2022 14:21:30 +0100 Subject: CI: Add glue to build with mingw-w64 toolchain on Debian Signed-off-by: Simon McVittie --- tools/ci-build.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 8a0ddcc0..440fe709 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -439,6 +439,7 @@ case "$ci_buildsys" in export DBUS_TEST_MALLOC_FAILURES=0 meson_setup= + cross_file= # openSUSE has convenience wrappers that run Meson with appropriate # cross options @@ -451,8 +452,20 @@ case "$ci_buildsys" in ;; esac - if [ -z "$meson_setup" ]; then + case "$ci_host" in + (*-w64-mingw32) + cross_file="${srcdir}/maint/${ci_host}.txt" + ;; + esac + + # Debian doesn't have similar convenience wrappers, but we can use + # a cross-file + if [ -z "$meson_setup" ] || ! command -v "$meson_setup" >/dev/null; then meson_setup="meson setup" + + if [ -n "$cross_file" ]; then + set -- --cross-file="$cross_file" "$@" + fi fi # FIXME: ducktype target fails on debian CI.. -- cgit v1.2.1