diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2018-07-06 17:19:32 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-01 22:37:04 -0700 |
| commit | 22ba5204472650338e3d695074d1da90ee94ca87 (patch) | |
| tree | 759b538e9b76ef09d64fb01c49c65fbb1750d6b2 /src/pal/tools | |
| parent | d7191b58cfc263479f57b45084097b773d8c235a (diff) | |
| download | coreclr-22ba5204472650338e3d695074d1da90ee94ca87.tar.gz coreclr-22ba5204472650338e3d695074d1da90ee94ca87.tar.bz2 coreclr-22ba5204472650338e3d695074d1da90ee94ca87.zip | |
Enable ARM64 builds using release product tools
Remove support for specifying the toolset directory for arm64,
which was used to point to an internal toolset.
Building for arm64 now works just like the other platforms, e.g.
invoke `build arm64`.
The requirements:
. Visual Studio 2017 Update 4 or later, with ARM64 toolset installed
. Windows SDK 10.0.17134.0 or later
. CMake 3.10 or later
Diffstat (limited to 'src/pal/tools')
| -rw-r--r-- | src/pal/tools/gen-buildsys-win.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index 70da41aa86..221d32269b 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -1,4 +1,4 @@ -@if not defined __echo @echo off +@if not defined _echo @echo off rem rem This file invokes cmake and generates the build system for windows. @@ -22,8 +22,8 @@ set __CmakeGenerator=Visual Studio if /i "%__VSVersion%" == "vs2017" (set __CmakeGenerator=%__CmakeGenerator% 15 2017) if /i "%__VSVersion%" == "vs2015" (set __CmakeGenerator=%__CmakeGenerator% 14 2015) if /i "%__Arch%" == "x64" (set __CmakeGenerator=%__CmakeGenerator% Win64) -if /i "%__Arch%" == "arm64" (set __CmakeGenerator=%__CmakeGenerator% Win64) if /i "%__Arch%" == "arm" (set __CmakeGenerator=%__CmakeGenerator% ARM) +if /i "%__Arch%" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A ARM64) if /i "%__NMakeMakefiles%" == "1" (set __CmakeGenerator=NMake Makefiles) |