From fb6ad44ca8ab1bc99dde130ebff8d28c9d13c5b4 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 1 Dec 2025 23:44:49 +0000
Subject: [PATCH] Extra anti-WSL protection

On a machine with Windows Subsystem for Linux installed, the first bash in the path will typically be the WSL launcher that gives Linux bash.

We must therefore ensure we recursively call into the MSYS2 shell we're already using.
---
 CI/activate_msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/activate_msvc.sh b/CI/activate_msvc.sh
index c62ea4ca6d..071521420c 100644
--- a/CI/activate_msvc.sh
+++ b/CI/activate_msvc.sh
@@ -32,7 +32,7 @@ command -v unixPathAsWindows >/dev/null 2>&1 || function unixPathAsWindows {
 
 
 # capture CMD environment in a shell with MSVC activated
-cmd //c "$(unixPathAsWindows "$(dirname "${BASH_SOURCE[0]}")")\ActivateMSVC.bat" "&&" "bash" "-c" "declare -px > declared_env.sh"
+cmd //c "$(unixPathAsWindows "$(dirname "${BASH_SOURCE[0]}")")\ActivateMSVC.bat" "&&" "$(unixPathAsWindows $BASH)" "-c" "declare -px > declared_env.sh"
 source ./declared_env.sh
 rm declared_env.sh