diff options
| author | Jarret Shook <jashoo@microsoft.com> | 2018-10-11 15:23:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 15:23:17 -0700 |
| commit | 907c013a7f5bf6ef4e37519ca27b7ea6fb998153 (patch) | |
| tree | 553bce01187dc0f4c3f43562173451bfb56e8230 /init-tools.cmd | |
| parent | e6cdf8eed22c8811735409bdd67b9a445b58f7de (diff) | |
| download | coreclr-907c013a7f5bf6ef4e37519ca27b7ea6fb998153.tar.gz coreclr-907c013a7f5bf6ef4e37519ca27b7ea6fb998153.tar.bz2 coreclr-907c013a7f5bf6ef4e37519ca27b7ea6fb998153.zip | |
Do not restore or initialize buildtools for x86/arm64 (#20370)
* Do not restore or initialize buildtools for x86/arm64
* Remove string to download cli correctly
Diffstat (limited to 'init-tools.cmd')
| -rw-r--r-- | init-tools.cmd | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/init-tools.cmd b/init-tools.cmd index 5cb8e6ae5f..9b3a0c7e47 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -55,7 +55,7 @@ if /i "%PROCESSOR_ARCHITECTURE%" == "arm" ( ) if /i "%PROCESSOR_ARCHITECTURE%" == "amd64" ( - set _Arch="x64" + set _Arch=x64 goto ArchSet ) @@ -65,7 +65,7 @@ REM REM TODO: consume native arm64 toolset, blocked by official arm64 windows cli REM : release. See https://github.com/dotnet/coreclr/issues/19614 for more REM : information -set _Arch="x86" +set _Arch=x86 echo "init-tools.cmd: Setting arch to %_Arch% for build tools" @@ -85,6 +85,11 @@ if NOT exist "%DOTNET_LOCAL_PATH%" ( :afterdotnetrestore +REM We do not need the build tools for arm64/x86 +if /i "%_Arch%" == "x86" ( + goto :EOF +) + if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" @@ -96,11 +101,6 @@ if NOT exist "%BUILD_TOOLS_PATH%\init-tools.cmd" ( :afterbuildtoolsrestore -REM We do not need the build tools for arm64 -if /i "%PROCESSOR_ARCHITECTURE%" == "arm64" ( - goto :EOF -) - :: Ask init-tools to also restore ILAsm set /p ILASMCOMPILER_VERSION=< "%~dp0ILAsmVersion.txt" |