diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2016-04-14 12:57:41 -0700 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2016-04-14 15:21:29 -0700 |
| commit | a3bb6a066eae8a7daede52ed576e8cd8d1d50780 (patch) | |
| tree | 03ac73ed2dc362c487baaa2705ab864d833f0435 /src/pal/tools | |
| parent | e63de4a0d1dd9c5ad840495579c5437a0095bea1 (diff) | |
| download | coreclr-a3bb6a066eae8a7daede52ed576e8cd8d1d50780.tar.gz coreclr-a3bb6a066eae8a7daede52ed576e8cd8d1d50780.tar.bz2 coreclr-a3bb6a066eae8a7daede52ed576e8cd8d1d50780.zip | |
Make it possible to build JIT32 in the OSS tree.
This change adds a new argument to build.cmd, buildjit32, that configures
the build to build and link JIT32 instead of RyuJIT if the sources are
available in `src/jit32`.
Diffstat (limited to 'src/pal/tools')
| -rw-r--r-- | src/pal/tools/gen-buildsys-win.bat | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index 0836268860..cccd342b79 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -5,7 +5,7 @@ rem This file invokes cmake and generates the build system for windows. set argC=0 for %%x in (%*) do Set /A argC+=1 -if NOT %argC%==3 GOTO :USAGE +if NOT %argC%==3 if NOT %argC%==4 GOTO :USAGE if %1=="/?" GOTO :USAGE setlocal @@ -16,11 +16,12 @@ set "basePath=%basePath:"=%" if %basePath:~-1%==\ set "basePath=%basePath:~0,-1%" set __VSString=12 2013 +set __UseVS=1 if /i "%2" == "vs2015" (set __VSString=14 2015) if /i "%3" == "x64" (set __VSString=%__VSString% Win64) -if /i "%3" == "arm64" ( - set USE_VS=0 -) +if /i "%3" == "arm64" (set UseVS=0) + +set __BuildJit32=%4 if defined CMakePath goto DoGen @@ -28,10 +29,10 @@ if defined CMakePath goto DoGen for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& .\probe-win.ps1"') do %%a :DoGen -if "%USE_VS%" == "0" ( +if "%UseVS%" == "0" ( "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" -G "Visual Studio %__VSString% Win64" %1 ) else ( - "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" -G "Visual Studio %__VSString%" %1 + "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" %__BuildJit32% -G "Visual Studio %__VSString%" %1 ) endlocal GOTO :DONE |