[CMAKE]

* Use the x86 toolchain for host tools if the targeting platform is ARM. Brought to you by Yuntian Zhang.
CORE-7407 #resolve #comment Committed in r64849. Thanks!

svn path=/trunk/; revision=64849

diff --git a/reactos/configure.cmd b/reactos/configure.cmd
index bdc66fd..78e6360 100755 (executable)
--- a/reactos/configure.cmd
+++ b/reactos/configure.cmd
@@ -77,6 +77,7 @@ if defined ROS_ARCH (
                 set CMAKE_GENERATOR="Visual Studio 11 Win64"\r
             ) else if "!ARCH!" == "arm" (\r
                 set CMAKE_GENERATOR="Visual Studio 11 ARM"\r
+                set CMAKE_GENERATOR_HOST="Visual Studio 11"\r
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 11"\r
             )\r
@@ -85,6 +86,7 @@ if defined ROS_ARCH (
                 set CMAKE_GENERATOR="Visual Studio 12 Win64"\r
             ) else if "!ARCH!" == "arm" (\r
                 set CMAKE_GENERATOR="Visual Studio 12 ARM"\r
+                set CMAKE_GENERATOR_HOST="Visual Studio 12"\r
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 12"\r
             )\r
@@ -116,6 +118,9 @@ if %USE_VSCMD% == 1 (
     ) else (\r
         set CMAKE_GENERATOR="Ninja"\r
     )\r
+    if "!ARCH!" == "arm" (\r
+        set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR!\r
+    )\r
 )\r
 \r
 :: Create directories\r
@@ -146,7 +151,7 @@ set REACTOS_BUILD_TOOLS_DIR=%CD%
 :: Use x86 for ARM host tools\r
 if "%ARCH%" == "arm" (\r
     :: Launch new script instance for x86 host tools configuration\r
-    start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR%\r
+    start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR_HOST%\r
 ) else (\r
     cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"\r
 )\r