From e98a3f26e2a21dbfd93bdc8f36e37bd6f5bedd57 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 12 Jan 2016 21:11:09 +0000 Subject: [PATCH] Fix da0bce34 Windows doesn't define a default linker --- cmake/32-bit-toolchain.cmake | 1 + cmake/64-bit-toolchain.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake index f7418431..90843169 100644 --- a/cmake/32-bit-toolchain.cmake +++ b/cmake/32-bit-toolchain.cmake @@ -33,6 +33,7 @@ set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc) set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++) set (CMAKE_AR ar CACHE FILEPATH "" FORCE) set (CMAKE_NM nm CACHE FILEPATH "" FORCE) +set (CMAKE_LINKER ld CACHE FILEPATH "" FORCE) #set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE) set (CMAKE_RC_COMPILER windres) diff --git a/cmake/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake index 2217d077..4fc024c2 100644 --- a/cmake/64-bit-toolchain.cmake +++ b/cmake/64-bit-toolchain.cmake @@ -33,6 +33,7 @@ set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc) set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++) set (CMAKE_AR ar CACHE FILEPATH "" FORCE) set (CMAKE_NM nm CACHE FILEPATH "" FORCE) +set (CMAKE_LINKER ld CACHE FILEPATH "" FORCE) #set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE) set (CMAKE_RC_COMPILER windres)