From 61a437c27f2b1d6bc9a91186f761f6793cd444aa Mon Sep 17 00:00:00 2001
From: krcroft <krcroft@users.noreply.github.com>
Date: Mon, 25 Nov 2019 17:11:28 -0800
Subject: [PATCH] Override architecture and host for 32-bit windows builds

Noted by vogons.org user jmarsh; thank you.
---
 .github/workflows/windows.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8b242380..6d839db2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,9 +1,9 @@
 name: Windows builds
 on: push
 env:
-  MAX_WARNINGS_GCC_32bit_Debug:     246
+  MAX_WARNINGS_GCC_32bit_Debug:     243
   MAX_WARNINGS_GCC_64bit_Debug:     359
-  MAX_WARNINGS_Clang_32bit_Debug:   101
+  MAX_WARNINGS_Clang_32bit_Debug:   105
   MAX_WARNINGS_Clang_64bit_Debug:   160
 
 jobs:
@@ -66,6 +66,12 @@ jobs:
         run:  ./scripts/log-env.sh
       - name:  Debug Build
         shell: python scripts\msys-bash.py {0}
-        run:   ./scripts/build.sh --compiler ${{ matrix.compiler }} --build-type Debug --bin-path /mingw${{ matrix.bits }}/bin
+        env:
+          ARCH_32: i686
+          ARCH_64: x86_64
+        run:  |
+          export MSYSTEM_CARCH="$ARCH_${{ matrix.bits }}"
+          export MSYSTEM_CHOST="$ARCH_${{ matrix.bits }}-pc-msys"
+          ./scripts/build.sh --compiler ${{ matrix.compiler }} --build-type Debug --bin-path /mingw${{ matrix.bits }}/bin
       - name:  Debug Warnings
         run:   '.\scripts\count-warnings.py -m $env:MAX_WARNINGS_${{ matrix.compiler }}_${{ matrix.bits }}bit_Debug build.log'