From cb7e82e9dc2d71907cec36abda317c8d55d02672 Mon Sep 17 00:00:00 2001
From: Frederik Seiffert <frederik@algoriddim.com>
Date: Thu, 16 Feb 2023 17:15:27 +0100
Subject: [PATCH] CI: fix MSVC builds when building dependencies

---
 .github/workflows/main.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 300cf4f71..fc826934e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -236,14 +236,19 @@ jobs:
         if: env.IS_WINDOWS_MSVC == 'true'
         with:
           msystem: MSYS
-          install: make autoconf automake libtool
+          install: make autoconf automake libtool pkg-config
           # make Windows packages like Clang available in MSYS
           path-type: inherit
       
-      - name: Delete MinGW gmake (MSVC)
+      - name: Remove Perl Strawberry installation and MinGW gmake (MSVC)
         if: env.IS_WINDOWS_MSVC == 'true'
-        # delete /c/Strawberry/c/bin/gmake built for MinGW that is found on runners, because we must use make built for MSYS
-        run: if GMAKE_PATH=`which gmake`; then rm -f "$GMAKE_PATH"; fi
+        # C:\Strawberry contains various MinGW libraries and binaries like pkg-config
+        # that can get picked up by configure/CMake and don't necessarily behave
+        # correctly when not using a MinGW environment, and more specifically we cannot
+        # use MinGW gmake but must use MSYS make for correctly handling of Windows paths,
+        # so we delete everything that could mess up our builds
+        run: rmdir /S /Q C:\Strawberry
+        shell: cmd
 
       - name: Install Windows packages (MSVC)
         if: env.IS_WINDOWS_MSVC == 'true'