diff options
| author | Anton Lapounov <antonl@microsoft.com> | 2020-09-04 03:23:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 03:23:25 +0300 |
| commit | 03c7674fb3dd0f8b7e690027f256f4d293a95481 (patch) | |
| tree | 681290297b8a8a88f933c881975dcf7556e4ac4b /src/coreclr/build-runtime.cmd | |
| parent | 5b83348520b6ac82d6b8bc84918ff72035c0c0f3 (diff) | |
Fix Crossgen2 package by using the proper UCRT version (#41784)
Diffstat (limited to 'src/coreclr/build-runtime.cmd')
| -rw-r--r-- | src/coreclr/build-runtime.cmd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd index 628f4eefbff..e2b80045fdf 100644 --- a/src/coreclr/build-runtime.cmd +++ b/src/coreclr/build-runtime.cmd @@ -396,7 +396,7 @@ set _C= set /p PYTHON=<%TEMP%\pythonlocation.txt if NOT DEFINED PYTHON ( - echo %__ErrMsgPrefix%%__MsgPrefix%Error: Could not find a python installation + echo %__ErrMsgPrefix%%__MsgPrefix%Error: Could not find a Python installation. goto ExitWithError ) @@ -550,17 +550,17 @@ if %__BuildNative% EQU 1 ( if /i "%__BuildArch%" == "arm64" goto SkipCopyUcrt - set "__UCRTDir=%UniversalCRTSDKDIR%Redist\ucrt\DLLs\%__BuildArch%\" - if not exist "!__UCRTDir!" set "__UCRTDir=%UniversalCRTSDKDIR%Redist\%UCRTVersion%\ucrt\DLLs\%__BuildArch%\" - if not exist "!__UCRTDir!" ( - echo %__ErrMsgPrefix%%__MsgPrefix%Error: Please install the Redistributable Universal C Runtime. + if not defined UCRTVersion ( + echo %__ErrMsgPrefix%%__MsgPrefix%Error: Please install Windows 10 SDK. goto ExitWithError ) + set "__UCRTDir=%UniversalCRTSdkDir%Redist\%UCRTVersion%\ucrt\DLLs\%__BuildArch%\" + xcopy /Y/I/E/D/F "!__UCRTDir!*.dll" "%__BinDir%\Redist\ucrt\DLLs\%__BuildArch%" if not !errorlevel! == 0 ( set __exitCode=!errorlevel! - echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to copy the CRT to the output. + echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to copy the Universal CRT to the artifacts directory. goto ExitWithCode ) |