Merge pull request #608

e98a3f2 Fix da0bce34 (Howard Chu)
9 years ago · 64c0806e65
parent 2ee050d87a e98a3f26e2
commit 64c0806e65
2 changed files with 2 additions and 0 deletions
--- 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)

--- 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)