[ROSBE/CMAKE]

* Set the correct prefix for the upcoming RosBE 2.1 toolchain.

svn path=/trunk/; revision=57913

diff --git a/reactos/toolchain-gcc.cmake b/reactos/toolchain-gcc.cmake
index a7d5068..f2ef79a 100644 (file)
--- a/reactos/toolchain-gcc.cmake
+++ b/reactos/toolchain-gcc.cmake
@@ -10,8 +10,12 @@ if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
         if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
             set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
         else()
-            set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
-        endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+            if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1)
+                set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
+            else()
+                set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
+            endif()
+        endif()
 
     elseif(ARCH STREQUAL "amd64")
         set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix")