diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-24 14:21:30 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | c21d47836cd73def920183633e326e337eee57b4 (patch) | |
| tree | d625a0c51217b2991c7dfe6d2ac00173cbf725ff /tools | |
| parent | da94d0c0290fab5635713a8f587ad091e9b8ab2f (diff) | |
| download | dbus-c21d47836cd73def920183633e326e337eee57b4.tar.gz | |
CI: Add glue to build with mingw-w64 toolchain on Debian
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 15 |
1 files changed, 14 insertions, 1 deletions
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.. |