From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Mon, 31 Jan 2022 23:59:42 +0000 (-0800)
Subject: Prefer posix versions of MinGW for compiling against googletest.
X-Git-Tag: 2.1.0-beta1~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21251622daf4a25e13886c4908c858677ce16a70;p=thirdparty%2Fzlib-ng.git

Prefer posix versions of MinGW for compiling against googletest.
---

diff --git a/cmake/toolchain-mingw-i686.cmake b/cmake/toolchain-mingw-i686.cmake
index 9a51cd22b..4b1264cb5 100644
--- a/cmake/toolchain-mingw-i686.cmake
+++ b/cmake/toolchain-mingw-i686.cmake
@@ -12,7 +12,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
+# Prefer posix gcc variant for gtest pthread support
 find_program(C_COMPILER_FULL_PATH NAMES
+    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc-posix
     ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc
     gcc-mingw32-w64-${CMAKE_C_COMPILER_TARGET})
 if(NOT C_COMPILER_FULL_PATH)
@@ -22,6 +24,7 @@ set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
 
 find_program(CXX_COMPILER_FULL_PATH NAMES
     g++-mingw-w64-${CMAKE_CXX_COMPILER_TARGET}
+    ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++-posix
     ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++)
 if(CXX_COMPILER_FULL_PATH)
     set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
diff --git a/cmake/toolchain-mingw-x86_64.cmake b/cmake/toolchain-mingw-x86_64.cmake
index aa597da33..7ae814042 100644
--- a/cmake/toolchain-mingw-x86_64.cmake
+++ b/cmake/toolchain-mingw-x86_64.cmake
@@ -12,13 +12,18 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-find_program(C_COMPILER_FULL_PATH NAMES ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc)
+# Prefer posix gcc variant for gtest pthread support
+find_program(C_COMPILER_FULL_PATH NAMES
+    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc-posix
+    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-gcc)
 if(NOT C_COMPILER_FULL_PATH)
     message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
 endif()
 set(CMAKE_C_COMPILER ${C_COMPILER_FULL_PATH})
 
-find_program(CXX_COMPILER_FULL_PATH NAMES ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++)
+find_program(CXX_COMPILER_FULL_PATH NAMES
+    ${CMAKE_C_COMPILER_TARGET}-w64-mingw32-g++-posix
+    ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++)
 if(CXX_COMPILER_FULL_PATH)
     set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
 endif()