From 09a36ad62bfa787642778b8076ae5b4ba4a64fcc Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Tue, 8 Mar 2022 09:26:40 -0500
Subject: Run Windows build on Windows 2022 runner

---
 build-scripts/build-windows | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'build-scripts/build-windows')

diff --git a/build-scripts/build-windows b/build-scripts/build-windows
index 81543668..e08b653e 100755
--- a/build-scripts/build-windows
+++ b/build-scripts/build-windows
@@ -6,16 +6,14 @@ tool=$2
 
 if [[ $tool == mingw ]]; then
     pacman -Sy --noconfirm make base-devel tar zip unzip
-    if [ -d /c/msys64 ]; then
-        PATH="/c/msys64/mingw$wordsize/bin:$PATH"
-    else
+    if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then
         if [[ $wordsize == 64 ]]; then
             pacman -Sy --noconfirm mingw-w64-x86_64-toolchain
         else
             pacman -Sy --noconfirm mingw-w64-i686-toolchain
         fi
-        PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH"
     fi
+    PATH="/c/msys64/mingw$wordsize/bin:$PATH"
     g++ -v
 elif [[ $tool == msvc ]]; then
     cl
-- 
cgit v1.2.3-54-g00ecf