diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2017-10-26 13:29:55 -0700 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2017-10-26 13:29:55 -0700 |
| commit | 52ebf91408fafea70396ca8bf2589c655f6d6bdd (patch) | |
| tree | 2dc6dea4afddb2f1d0ca0c77b5c6ef20d27dd7cc /build-test.cmd | |
| parent | ea3f140da0e9e3bf6ee1f1c9d88a231cf3875a82 (diff) | |
| download | coreclr-52ebf91408fafea70396ca8bf2589c655f6d6bdd.tar.gz coreclr-52ebf91408fafea70396ca8bf2589c655f6d6bdd.tar.bz2 coreclr-52ebf91408fafea70396ca8bf2589c655f6d6bdd.zip | |
Allow building arm64 using VS2017 tools
VS2017 now includes ARM64 compilers. Change the build scripts so
that the normal VC tools path is used for the builds for ARM64.
However, if -toolset_dir is passed, then use the specified tools,
as before.
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/build-test.cmd b/build-test.cmd index b247090604..e3ae769bc5 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -87,7 +87,7 @@ if /i "%1" == "-help" goto Usage if /i "%1" == "x64" (set __BuildArch=x64&set __VCBuildArch=x86_amd64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "x86" (set __BuildArch=x86&set __VCBuildArch=x86&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "arm" (set __BuildArch=arm&set __VCBuildArch=x86_arm&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "arm64" (set __BuildArch=arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "arm64" (set __BuildArch=arm64&set __VCBuildArch=x86_arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "debug" (set __BuildType=Debug&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "release" (set __BuildType=Release&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) @@ -126,9 +126,11 @@ call "%__VSToolsRoot%\VsDevCmd.bat" set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch% -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 defined __ToolsetDir ( + rem arm64 builds currently use private toolset which has not been released yet + REM TODO, remove once the toolset is open. + call :PrivateToolSet +) echo %__MsgPrefix%Commencing CoreCLR repo test build @@ -185,8 +187,8 @@ REM ============================================================================ echo %__MsgPrefix%Commencing build of native test components for %__BuildArch%/%__BuildType% if defined __ToolsetDir ( - echo %__MsgPrefix%ToolsetDir is defined to be :%__ToolsetDir% - goto GenVSSolution :: Private ToolSet is Defined + echo %__MsgPrefix%ToolsetDir is defined to be %__ToolsetDir% + goto GenVSSolution :: Private ToolSet is Defined ) :: Set the environment for the native build @@ -490,7 +492,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. |