From 7cb11615a1770651bb37fe73854b566b0673ca5c Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Wed, 14 Oct 2015 16:55:47 -0700 Subject: [PATCH] Skip Crossgen of mscorlib for x86 x86 is currently cannot crossgen mscorlib, but we want to get a build in the lab so that we make sure we do not break the x86 build of coreclr when we make changes. This change defaults to skipping crossgen for x86 unless docrossgen is passed to build.cmd. Commit migrated from https://github.com/dotnet/coreclr/commit/98189891801fd4fadfc5d510a514f3e0f90fec77 --- src/coreclr/build.cmd | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index f5f1d59..046970e 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -23,6 +23,7 @@ set "__RootBinDir=%__ProjectDir%\bin" set "__LogsDir=%__RootBinDir%\Logs" set __MSBCleanBuildArgs= set __SkipTestBuild= +set __DoCrossgen= :Arg_Loop if "%1" == "" goto ArgsDone @@ -44,6 +45,7 @@ if /i "%1" == "windowsmscorlib" (set __MscorlibOnly=1&set __BuildOS=Windows_NT&s if /i "%1" == "vs2013" (set __VSVersion=%1&shift&goto Arg_Loop) if /i "%1" == "vs2015" (set __VSVersion=%1&shift&goto Arg_Loop) if /i "%1" == "skiptestbuild" (set __SkipTestBuild=1&shift&goto Arg_Loop) +if /i "%1" == "docrossgen" (set __DoCrossgen=1&shift&goto Arg_Loop) echo Invalid commandline argument: %1 goto Usage @@ -205,6 +207,13 @@ echo MScorlib build failed. Refer !__MScorlibBuildLog! for details. exit /b 1 :CrossGenMscorlib +if /i "%__BuildArch%" == "x86" ( + if not defined __DoCrossgen ( + echo Skipping Crossgen + goto PerformTestBuild + ) +) + echo Generating native image of mscorlib for %__BuildOS%.%__BuildArch%.%__BuildType% echo. set "__CrossGenMScorlibLog=%__LogsDir%\CrossgenMScorlib_%__BuildOS%__%__BuildArch%__%__BuildType%.log" -- 2.7.4