diff options
| author | Karthik Rajasekaran <karajas@microsoft.com> | 2017-10-30 17:49:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 17:49:45 -0700 |
| commit | d07f13c57203348d9ddb5a4bd001e00b0e30a242 (patch) | |
| tree | 25b047055020e5e869ef555408775ed9109e9a11 /buildpipeline | |
| parent | e28de23744fcdb96333ec592c692e92c4e06f4a9 (diff) | |
| download | coreclr-d07f13c57203348d9ddb5a4bd001e00b0e30a242.tar.gz coreclr-d07f13c57203348d9ddb5a4bd001e00b0e30a242.tar.bz2 coreclr-d07f13c57203348d9ddb5a4bd001e00b0e30a242.zip | |
Set toolset dir only for ARM64 (#14755)
Diffstat (limited to 'buildpipeline')
| -rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Windows.json | 6 | ||||
| -rw-r--r-- | buildpipeline/pipelines.json | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json index ac7e3850ac..1d41c75d83 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json @@ -87,7 +87,7 @@ }, "inputs": { "filename": "build.cmd", - "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"", + "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) $(ToolsetArgs) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"", "workingFolder": "", "failOnStandardError": "false" } @@ -281,6 +281,10 @@ "value": "x64", "allowOverride": true }, + "ToolsetArgs": { + "value": "", + "allowOverride": true + }, "Priority": { "value": "0" }, diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index ec7e1b6d9b..91f3eaf917 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -80,7 +80,8 @@ { "Name": "DotNet-CoreClr-Trusted-Windows", "Parameters": { - "Architecture": "arm64" + "Architecture": "arm64", + "ToolsetArgs": "toolset_dir C:\\tools\\clr" }, "ReportingParameters": { "OperatingSystem": "Windows", |