diff options
| author | Sergiy Kuryata <sergeyk@microsoft.com> | 2019-04-15 16:07:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 16:07:35 -0700 |
| commit | a49cc4ad01b51b26165c371579be763c5ccc30f5 (patch) | |
| tree | c53cd4ed5aaa9629c357d1c80289a3ee00fc9894 /build-test.cmd | |
| parent | 9f9dcdd2780ac4716c757e0c78d7324f8e382891 (diff) | |
| download | coreclr-a49cc4ad01b51b26165c371579be763c5ccc30f5.tar.gz coreclr-a49cc4ad01b51b26165c371579be763c5ccc30f5.tar.bz2 coreclr-a49cc4ad01b51b26165c371579be763c5ccc30f5.zip | |
Fix precompiling CoreRoot overlay with crossgen for Windows arm/arm64 (#23946)
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build-test.cmd b/build-test.cmd index 774bd7c837..424232ebf2 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -358,7 +358,7 @@ if exist "%CORE_ROOT%" rd /s /q "%CORE_ROOT%" if exist "%CORE_ROOT_STAGE%" rd /s /q "%CORE_ROOT_STAGE%" md "%CORE_ROOT%" md "%CORE_ROOT_STAGE%" -xcopy "%__BinDir%" "%CORE_ROOT_STAGE%" +xcopy /s "%__BinDir%" "%CORE_ROOT_STAGE%" REM ========================================================================================= REM === @@ -562,7 +562,11 @@ echo "%2" | findstr /b "xunit." >nul && ( exit /b 0 ) -"%CORE_ROOT_STAGE%\crossgen.exe" /Platform_Assemblies_Paths "%CORE_ROOT%" /in "%1" /out "%CORE_ROOT%/temp.ni.dll" >nul 2>nul +set __CrossgenExe="%CORE_ROOT_STAGE%\crossgen.exe" +if /i "%__BuildArch%" == "arm" ( set __CrossgenExe="%CORE_ROOT_STAGE%\x86\crossgen.exe" ) +if /i "%__BuildArch%" == "arm64" ( set __CrossgenExe="%CORE_ROOT_STAGE%\x64\crossgen.exe" ) + +"%__CrossgenExe%" /Platform_Assemblies_Paths "%CORE_ROOT%" /in "%1" /out "%CORE_ROOT%/temp.ni.dll" >nul 2>nul set /a __exitCode = %errorlevel% if "%__exitCode%" == "-2146230517" ( echo %2 is not a managed assembly. @@ -570,7 +574,7 @@ if "%__exitCode%" == "-2146230517" ( ) if %__exitCode% neq 0 ( - echo Unable to precompile %2 + echo Unable to precompile %2, Exit Code is %__exitCode% exit /b 0 ) |