diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2017-03-10 17:11:24 -0800 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2017-04-05 07:22:03 -0700 |
| commit | e62151a88f71edcaa336f4265b4fc534d6f56940 (patch) | |
| tree | 24ce634cfc7d5e43fa42ba0b2dedd4a213e6820d /build.cmd | |
| parent | e93e79b3d012bc068c84ee5f65f8e755020d8a9c (diff) | |
| download | coreclr-e62151a88f71edcaa336f4265b4fc534d6f56940.tar.gz coreclr-e62151a88f71edcaa336f4265b4fc534d6f56940.tar.bz2 coreclr-e62151a88f71edcaa336f4265b4fc534d6f56940.zip | |
Only build compatjit.dll when building JIT32.
In order to avoid confusion, do not build and package compatjit.dll
unless we are building JIT32.
Fixes #10106.
Diffstat (limited to 'build.cmd')
| -rw-r--r-- | build.cmd | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -75,7 +75,7 @@ set __BuildArchArm64=0 set __BuildTypeDebug=0 set __BuildTypeChecked=0 set __BuildTypeRelease=0 -set __BuildJit32="-DBUILD_JIT32=0" +set __BuildJit32=0 set __BuildStandaloneGC="-DFEATURE_STANDALONE_GC=0" set __PgoInstrument=0 @@ -142,7 +142,7 @@ if /i "%1" == "skiptests" (set __BuildTests=0&set processedArgs=!proce if /i "%1" == "skipbuildpackages" (set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skiprestoreoptdata" (set __RestoreOptData=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "usenmakemakefiles" (set __NMakeMakefiles=1&set __ConfigureOnly=1&set __BuildNative=1&set __BuildNativeCoreLib=0&set __BuildCoreLib=0&set __BuildTests=0&set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "buildjit32" (set __BuildJit32="-DBUILD_JIT32=1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "buildjit32" (set __BuildJit32=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "pgoinstrument" (set __PgoInstrument=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "ibcinstrument" (set __IbcTuning=/Tuning&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) @@ -318,7 +318,7 @@ if %__BuildNative% EQU 1 ( pushd "%__IntermediatesDir%" set __ExtraCmakeArgs=!___SDKVersion! "-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_VERSION=%__PgoOptDataVersion%" - call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% %__BuildJit32% %__BuildStandaloneGC% !__ExtraCmakeArgs! + call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% "-DBUILD_JIT32=%__BuildJit32%" %__BuildStandaloneGC% !__ExtraCmakeArgs! @if defined _echo @echo on popd :SkipConfigure @@ -430,6 +430,10 @@ if %__BuildCoreLib% EQU 1 ( set __nugetBuildArgs=-buildNugetPackage=true ) + set PackageCompatJit= + if "%__BuildJit32%" == "1" ( + set PackageCompatJit=1 + ) @call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\build.proj -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! !__nugetBuildArgs! %__RunArgs% !__ExtraBuildArgs! %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__MsgPrefix%Error: System.Private.CoreLib build failed. Refer to the build log files for details: |