From: Long Nguyen Date: Sat, 13 Aug 2022 03:38:02 +0000 (+0700) Subject: Remove extra compiler names X-Git-Tag: 2.1.0-beta1~178 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20b93ca688ff959b7e5afc87172772884a33cbbd;p=thirdparty%2Fzlib-ng.git Remove extra compiler names --- diff --git a/cmake/toolchain-mingw-i686.cmake b/cmake/toolchain-mingw-i686.cmake index cc2da2ff5..b95e63f50 100644 --- a/cmake/toolchain-mingw-i686.cmake +++ b/cmake/toolchain-mingw-i686.cmake @@ -15,15 +15,13 @@ 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}-gcc-posix - ${CMAKE_C_COMPILER_TARGET}-gcc - gcc-mingw32-w64-${CMAKE_C_COMPILER_TARGET}) + ${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 - g++-mingw-w64-${CMAKE_CXX_COMPILER_TARGET} ${CMAKE_CXX_COMPILER_TARGET}-g++-posix ${CMAKE_CXX_COMPILER_TARGET}-g++) if(CXX_COMPILER_FULL_PATH)