From c63bf5f80447598c4a83244f2a92dd65209feeb4 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 6 Feb 2024 22:26:50 -0800 Subject: [PATCH] windows-build.sh: ensure that -static-libgcc is used with MSYS2 gcc In MSYS2 MINGW32, the gcc version is "i686-w64-mingw32-cc.exe (Rev4, Built by MSYS2 project) 13.2.0" which does not contain the string "(GCC)" as expected. Similarly for MSYS2 MINGW64. This means that -static-libgcc does not get used as intended. As a quick fix, just invert the check, so gcc is now detected by checking for not clang.. --- tools/windows-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/windows-build.sh b/tools/windows-build.sh index e6ce4a08..63bd58b4 100755 --- a/tools/windows-build.sh +++ b/tools/windows-build.sh @@ -217,7 +217,7 @@ configure_wimlib() fi exit 1 fi - if "$cc" --version | grep -q '(GCC)'; then + if ! "$cc" --version | grep -q -i 'clang'; then configure_args+=("CC=$cc -static-libgcc") fi configure_args+=("${EXTRA_CONFIGURE_ARGS[@]}") -- 2.46.1