aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Michaels <>2014-08-07 14:27:12 -0400
committerRiccardo Spagni <ric@spagni.net>2014-09-15 22:36:14 +0200
commitdfa11575f2e195542eff4c19c11434c8dabd2e40 (patch)
treec0a942c4f91f0d6b31e3512223be5ce1d50c9830
parentForce CMake to link the runtime statically (diff)
downloadmonero-dfa11575f2e195542eff4c19c11434c8dabd2e40.tar.xz
Use unwrapped binutils for msys2
The default binutils wrappers are built without plugin support. This will streamline the build process until we decide to start supporting LTO.
-rw-r--r--toolchains/msys2-m32-toolchain.cmake6
-rw-r--r--toolchains/msys2-m64-toolchain.cmake6
2 files changed, 6 insertions, 6 deletions
diff --git a/toolchains/msys2-m32-toolchain.cmake b/toolchains/msys2-m32-toolchain.cmake
index 7cc463a51..21baf503b 100644
--- a/toolchains/msys2-m32-toolchain.cmake
+++ b/toolchains/msys2-m32-toolchain.cmake
@@ -3,9 +3,9 @@ set (CMAKE_SYSTEM_NAME Windows)
set (GCC_PREFIX i686-w64-mingw32)
set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
-set (CMAKE_AR ${GCC_PREFIX}-gcc-ar CACHE FILEPATH "" FORCE)
-set (CMAKE_NM ${GCC_PREFIX}-gcc-nm CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
+#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
set (CMAKE_RC_COMPILER windres)
set (CMAKE_FIND_ROOT_PATH c:/msys2/mingw32)
diff --git a/toolchains/msys2-m64-toolchain.cmake b/toolchains/msys2-m64-toolchain.cmake
index 458168955..8884ae28d 100644
--- a/toolchains/msys2-m64-toolchain.cmake
+++ b/toolchains/msys2-m64-toolchain.cmake
@@ -3,9 +3,9 @@ set (CMAKE_SYSTEM_NAME Windows)
set (GCC_PREFIX x86_64-w64-mingw32)
set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
-set (CMAKE_AR ${GCC_PREFIX}-gcc-ar CACHE FILEPATH "" FORCE)
-set (CMAKE_NM ${GCC_PREFIX}-gcc-nm CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
+#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
set (CMAKE_RC_COMPILER windres)
set (CMAKE_FIND_ROOT_PATH c:/msys2/mingw64)