aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-10-28 14:26:41 -0700
committerGitHub <noreply@github.com>2020-10-28 14:26:41 -0700
commit1b1c17de8206231831b2bc8a06cff80506184be1 (patch)
treeb14e701224a7b12015ec3fef4782332251cd34de /scripts
parent0ff714bd520f5315081db50acce43644832451ba (diff)
downloadvcpkg-1b1c17de8206231831b2bc8a06cff80506184be1.tar.gz
vcpkg-1b1c17de8206231831b2bc8a06cff80506184be1.zip
[vcpkg baseline] [vs-yasm] Build yasm instead of downloading it to work around memory corruption bugs in yasm itself. (#14003)
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/azure-pipelines/test-modified-ports.ps14
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index 15cb8131f..85d0c7029 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -108,7 +108,9 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" `
# WORKAROUND: the x86-windows flavors of these are needed for all cross-compilation, but they are not auto-installed.
# Install them so the CI succeeds:
if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp')) {
- .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows @commonArgs
+ .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows @commonArgs
+} elseif ($Triplet -in @('x64-windows', 'x64-windows-static')) {
+ .\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs