Author: akhaldi
Date: Mon Oct 20 17:35:22 2014
New Revision: 64849
URL: http://svn.reactos.org/svn/reactos?rev=64849&view=rev
Log:
[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!
Modified:
trunk/reactos/configure.cmd
Modified: trunk/reactos/configure.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=64849&r1=64848&r2=64849&view=diff
==============================================================================
--- trunk/reactos/configure.cmd [iso-8859-1] (original)
+++ trunk/reactos/configure.cmd [iso-8859-1] Mon Oct 20 17:35:22 2014
@@ -77,6 +77,7 @@
set CMAKE_GENERATOR="Visual Studio 11 Win64"
) else if "!ARCH!" == "arm" (
set CMAKE_GENERATOR="Visual Studio 11 ARM"
+ set CMAKE_GENERATOR_HOST="Visual Studio 11"
) else (
set CMAKE_GENERATOR="Visual Studio 11"
)
@@ -85,6 +86,7 @@
set CMAKE_GENERATOR="Visual Studio 12 Win64"
) else if "!ARCH!" == "arm" (
set CMAKE_GENERATOR="Visual Studio 12 ARM"
+ set CMAKE_GENERATOR_HOST="Visual Studio 12"
) else (
set CMAKE_GENERATOR="Visual Studio 12"
)
@@ -116,6 +118,9 @@
) else (
set CMAKE_GENERATOR="Ninja"
)
+ if "!ARCH!" == "arm" (
+ set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR!
+ )
)
:: Create directories
@@ -146,7 +151,7 @@
:: Use x86 for ARM host tools
if "%ARCH%" == "arm" (
:: Launch new script instance for x86 host tools configuration
- start "Preparing host tools for ARM cross build..." /I /B /WAIT
%~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat"
%CMAKE_GENERATOR%
+ start "Preparing host tools for ARM cross build..." /I /B /WAIT
%~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat"
%CMAKE_GENERATOR_HOST%
) else (
cmake -G %CMAKE_GENERATOR% -DARCH:STRING=%ARCH% "%REACTOS_SOURCE_DIR%"
)
