diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-07-01 10:53:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 10:53:10 -0700 |
| commit | 532db1d8f7a5ac7d415fd9feccb7d1ee4377c9f3 (patch) | |
| tree | b9de86b0ec94aa7ff4c3cd07c2531a9920328403 /scripts/bootstrap.ps1 | |
| parent | 0084acc75da5fe831f90c0c16fcb3ce46fb8a533 (diff) | |
| download | vcpkg-532db1d8f7a5ac7d415fd9feccb7d1ee4377c9f3.tar.gz vcpkg-532db1d8f7a5ac7d415fd9feccb7d1ee4377c9f3.zip | |
[vcpkg] VM Update (#12176)
* [qt5] Add more dependent Linux packages for https://github.com/microsoft/vcpkg/pull/11596/
* [vcpkg] Add LLVM 10 to Windows CI machines for https://github.com/microsoft/vcpkg/pull/11655/
* [vcpkg] Add missing Param block to InstallLLVM function.
* [vcpkg] Add throw after all Write-Error calls for consistency with https://github.com/microsoft/vcpkg/pull/12172
Diffstat (limited to 'scripts/bootstrap.ps1')
| -rw-r--r-- | scripts/bootstrap.ps1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index dac97621f..fdbdf65ac 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -62,7 +62,7 @@ $vcpkgSourcesPath = "$vcpkgRootDir\toolsrc" if (!(Test-Path $vcpkgSourcesPath)) { Write-Error "Unable to determine vcpkg sources directory. '$vcpkgSourcesPath' does not exist." - return + throw } function getVisualStudioInstances() @@ -408,8 +408,9 @@ $ec = vcpkgInvokeCommandClean $msbuildExe $arguments if ($ec -ne 0) { Write-Error "Building vcpkg.exe failed. Please ensure you have installed Visual Studio with the Desktop C++ workload and the Windows SDK for Desktop C++." - return + throw } + Write-Host "`nBuilding vcpkg.exe... done.`n" if (-not $disableMetrics) |