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 /buildpipeline | |
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 'buildpipeline')
-rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Windows.json | 6 | ||||
-rw-r--r-- | buildpipeline/pipelines.json | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json index 1c9e727d0e..10115873a7 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json @@ -122,7 +122,7 @@ }, "inputs": { "filename": "build.cmd", - "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) $(ToolsetArgs) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"", + "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"", "workingFolder": "", "failOnStandardError": "false" } @@ -370,10 +370,6 @@ "value": "x64", "allowOverride": true }, - "ToolsetArgs": { - "value": "", - "allowOverride": true - }, "Priority": { "value": "0" }, diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index fddc4d5a28..8e9bb27f54 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -86,8 +86,7 @@ { "Name": "DotNet-CoreClr-Trusted-Windows", "Parameters": { - "Architecture": "arm64", - "ToolsetArgs": "toolset_dir C:\\tools\\clr" + "Architecture": "arm64" }, "ReportingParameters": { "OperatingSystem": "Windows", |