From dfa11575f2e195542eff4c19c11434c8dabd2e40 Mon Sep 17 00:00:00 2001
From: Zachary Michaels <>
Date: Thu, 7 Aug 2014 14:27:12 -0400
Subject: [PATCH] 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.
---
 toolchains/msys2-m32-toolchain.cmake | 6 +++---
 toolchains/msys2-m64-toolchain.cmake | 6 +++---
 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)