From ac35817a567fb5f3d8308be41de0a26ce2b88692 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 14 Dec 2012 21:56:11 +0000 Subject: [PATCH] [ROSBE/CMAKE] * Set the correct prefix for the upcoming RosBE 2.1 toolchain. svn path=/trunk/; revision=57913 --- reactos/toolchain-gcc.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/toolchain-gcc.cmake b/reactos/toolchain-gcc.cmake index a7d50685c22..f2ef79a9e2d 100644 --- 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")