diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2017-10-30 09:26:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 09:26:49 -0700 |
| commit | 9b6d5cdf7076f09f40273793d0f38c78c11ed764 (patch) | |
| tree | 6c665e42a654393adc26710820d9fb6d46f0e8f7 /build.cmd | |
| parent | 0c8b4af17f1206dee394205b6c9b428955e0a944 (diff) | |
| parent | 52ebf91408fafea70396ca8bf2589c655f6d6bdd (diff) | |
| download | coreclr-9b6d5cdf7076f09f40273793d0f38c78c11ed764.tar.gz coreclr-9b6d5cdf7076f09f40273793d0f38c78c11ed764.tar.bz2 coreclr-9b6d5cdf7076f09f40273793d0f38c78c11ed764.zip | |
Merge pull request #14712 from BruceForstall/VS2017Arm64
Allow building arm64 using VS2017 tools
Diffstat (limited to 'build.cmd')
| -rw-r--r-- | build.cmd | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -357,10 +357,10 @@ if %__BuildNative% EQU 1 ( echo %__MsgPrefix%Commencing build of native components for %__BuildOS%.%__BuildArch%.%__BuildType% - set nativePlatfromArgs=-platform=%__BuildArch% - if /i "%__BuildArch%" == "arm64" ( set nativePlatfromArgs=-useEnv ) + set __NativePlatformArgs=-platform=%__BuildArch% + if not "%__ToolsetDir%" == "" ( set __NativePlatformArgs=-useEnv ) - if /i "%__BuildArch%" == "arm64" ( + if not "%__ToolsetDir%" == "" ( rem arm64 builds currently use private toolset which has not been released yet REM TODO, remove once the toolset is open. call :PrivateToolSet @@ -376,6 +376,12 @@ if %__BuildNative% EQU 1 ( REM Make CMake pick the highest installed version in the 10.0.* range set ___SDKVersion="-DCMAKE_SYSTEM_VERSION=10.0" ) + if /i "%__BuildArch%" == "arm64" ( + set __VCBuildArch=x86_arm64 + + REM Make CMake pick the highest installed version in the 10.0.* range + set ___SDKVersion="-DCMAKE_SYSTEM_VERSION=10.0" + ) echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch! call "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch! @@ -414,7 +420,7 @@ if %__BuildNative% EQU 1 ( set __MsbuildWrn=/flp1:WarningsOnly;LogFile=!__BuildWrn! set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! - @call %__ProjectDir%\run.cmd build -Project=%__IntermediatesDir%\install.vcxproj -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! -configuration=%__BuildType% %nativePlatfromArgs% %__RunArgs% -ExtraParameters="/p:ForceImportBeforeCppTargets=%__ProjectDir%/clr.nativebuild.props /m:2" %__UnprocessedBuildArgs% + @call %__ProjectDir%\run.cmd build -Project=%__IntermediatesDir%\install.vcxproj -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! -configuration=%__BuildType% %__NativePlatformArgs% %__RunArgs% -ExtraParameters="/p:ForceImportBeforeCppTargets=%__ProjectDir%/clr.nativebuild.props /m:2" %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__MsgPrefix%Error: native component build failed. Refer to the build log files for details: @@ -654,7 +660,7 @@ if %__BuildTests% EQU 1 ( rem arm64 builds currently use private toolset which has not been released yet REM TODO, remove once the toolset is open. - if /i "%__BuildArch%" == "arm64" call :PrivateToolSet + if not "%__ToolsetDir%" == "" call :PrivateToolSet set NEXTCMD=call %__ProjectDir%\build-test.cmd %__BuildArch% %__BuildType% %__UnprocessedBuildArgs% echo %__MsgPrefix%!NEXTCMD! @@ -827,7 +833,7 @@ exit /b 1 :PrivateToolSet -echo %__MsgPrefix% Setting Up the usage of __ToolsetDir:%__ToolsetDir% +echo %__MsgPrefix%Setting up the usage of __ToolsetDir:%__ToolsetDir% if /i "%__ToolsetDir%" == "" ( echo %__MsgPrefix%Error: A toolset directory is required for the Arm64 Windows build. Use the toolset_dir argument. |