[ros-diffs] [reactos] 01/01: [CMAKE] Remove obsolete '_ROSBE_VERSION' checks

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6956dd3b13702773dced…

commit e6956dd3b13702773dced7a9acbb8e04c1b18e4e
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Wed Jun 24 20:41:44 2020 +0200
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Thu Sep 10 18:16:36 2020 +0200

    [CMAKE] Remove obsolete '_ROSBE_VERSION' checks
    
    following upgrade to RosBE (2.1 and now) 2.2.
---
 toolchain-clang.cmake | 6 +-----
 toolchain-gcc.cmake   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake
index 1c9ad5d6ca8..af3caeccda4 100644
--- a/toolchain-clang.cmake
+++ b/toolchain-clang.cmake
@@ -10,11 +10,7 @@ if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
         if(CMAKE_HOST_WIN32)
             set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain
Prefix")
         else()
-            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()
+            set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING
"MinGW-W64 Toolchain Prefix")
         endif()
 
     elseif(ARCH STREQUAL "amd64")
diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake
index 1d2a3a2be6e..d2801733ec4 100644
--- a/toolchain-gcc.cmake
+++ b/toolchain-gcc.cmake
@@ -16,11 +16,7 @@ if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
         if(CMAKE_HOST_WIN32)
             set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain
Prefix")
         else()
-            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()
+            set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING
"MinGW-W64 Toolchain Prefix")
         endif()
 
     elseif(ARCH STREQUAL "amd64")