diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-15 14:59:37 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-15 14:59:37 +0200 |
| commit | 64c0806e65f96f49b08db66a9defbee39850ea46 (patch) | |
| tree | 641def1dbd0f526ebe0ba68c52b3eead3afe3f46 | |
| parent | Merge pull request #607 (diff) | |
| parent | Fix da0bce34 (diff) | |
| download | monero-64c0806e65f96f49b08db66a9defbee39850ea46.tar.xz | |
Merge pull request #608
e98a3f2 Fix da0bce34 (Howard Chu)
| -rw-r--r-- | cmake/32-bit-toolchain.cmake | 1 | ||||
| -rw-r--r-- | cmake/64-bit-toolchain.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake index f74184315..908431697 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 2217d077d..4fc024c23 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) |