From e2b2f1fa2983d9b4d3e5bd2cc821940a0715aac8 Mon Sep 17 00:00:00 2001
From: Long Nguyen <nguyen.long.908132@gmail.com>
Date: Tue, 12 Jul 2022 16:27:52 +0700
Subject: [PATCH] Set `CMAKE_*_COMPILER_TARGET` to full triplet for mingw
 toolchains

---
 cmake/toolchain-mingw-i686.cmake   | 16 ++++++++--------
 cmake/toolchain-mingw-x86_64.cmake | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmake/toolchain-mingw-i686.cmake b/cmake/toolchain-mingw-i686.cmake
index 4b1264cb..cc2da2ff 100644
--- a/cmake/toolchain-mingw-i686.cmake
+++ b/cmake/toolchain-mingw-i686.cmake
@@ -1,8 +1,8 @@
 set(CMAKE_SYSTEM_NAME Windows)
 
-set(CMAKE_C_COMPILER_TARGET i686)
-set(CMAKE_CXX_COMPILER_TARGET i686)
-set(CMAKE_RC_COMPILER_TARGET i686)
+set(CMAKE_C_COMPILER_TARGET i686-w64-mingw32)
+set(CMAKE_CXX_COMPILER_TARGET i686-w64-mingw32)
+set(CMAKE_RC_COMPILER_TARGET i686-w64-mingw32)
 
 set(CMAKE_CROSSCOMPILING TRUE)
 set(CMAKE_CROSSCOMPILING_EMULATOR wine)
@@ -14,8 +14,8 @@ 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
+    ${CMAKE_C_COMPILER_TARGET}-gcc-posix
+    ${CMAKE_C_COMPILER_TARGET}-gcc
     gcc-mingw32-w64-${CMAKE_C_COMPILER_TARGET})
 if(NOT C_COMPILER_FULL_PATH)
     message(FATAL_ERROR "Cross-compiler for ${CMAKE_C_COMPILER_TARGET} not found")
@@ -24,14 +24,14 @@ 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++)
+    ${CMAKE_CXX_COMPILER_TARGET}-g++-posix
+    ${CMAKE_CXX_COMPILER_TARGET}-g++)
 if(CXX_COMPILER_FULL_PATH)
     set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
 endif()
 
 find_program(RC_COMPILER_FULL_PATH NAMES
-    ${CMAKE_RC_COMPILER_TARGET}-w64-mingw32-windres)
+    ${CMAKE_RC_COMPILER_TARGET}-windres)
 if(RC_COMPILER_FULL_PATH)
     set(CMAKE_RC_COMPILER ${RC_COMPILER_FULL_PATH})
 endif()
diff --git a/cmake/toolchain-mingw-x86_64.cmake b/cmake/toolchain-mingw-x86_64.cmake
index 7ae81404..8c660b0b 100644
--- a/cmake/toolchain-mingw-x86_64.cmake
+++ b/cmake/toolchain-mingw-x86_64.cmake
@@ -1,8 +1,8 @@
 set(CMAKE_SYSTEM_NAME Windows)
 
-set(CMAKE_C_COMPILER_TARGET x86_64)
-set(CMAKE_CXX_COMPILER_TARGET x86_64)
-set(CMAKE_RC_COMPILER_TARGET x86_64)
+set(CMAKE_C_COMPILER_TARGET x86_64-w64-mingw32)
+set(CMAKE_CXX_COMPILER_TARGET x86_64-w64-mingw32)
+set(CMAKE_RC_COMPILER_TARGET x86_64-w64-mingw32)
 
 set(CMAKE_CROSSCOMPILING TRUE)
 set(CMAKE_CROSSCOMPILING_EMULATOR wine)
@@ -14,21 +14,21 @@ 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)
+    ${CMAKE_C_COMPILER_TARGET}-gcc-posix
+    ${CMAKE_C_COMPILER_TARGET}-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_C_COMPILER_TARGET}-w64-mingw32-g++-posix
-    ${CMAKE_CXX_COMPILER_TARGET}-w64-mingw32-g++)
+    ${CMAKE_CXX_COMPILER_TARGET}-g++-posix
+    ${CMAKE_CXX_COMPILER_TARGET}-g++)
 if(CXX_COMPILER_FULL_PATH)
     set(CMAKE_CXX_COMPILER ${CXX_COMPILER_FULL_PATH})
 endif()
 
-find_program(RC_COMPILER_FULL_PATH NAMES ${CMAKE_RC_COMPILER_TARGET}-w64-mingw32-windres)
+find_program(RC_COMPILER_FULL_PATH NAMES ${CMAKE_RC_COMPILER_TARGET}-windres)
 if(RC_COMPILER_FULL_PATH)
     set(CMAKE_RC_COMPILER ${RC_COMPILER_FULL_PATH})
 endif()
-- 
2.47.3