diff options
| author | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
|---|---|---|
| committer | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
| commit | e27fe911982284788e63f4a92339386554706a4b (patch) | |
| tree | e695af1d6733cea93a29adab73ff819430ff872e /scripts/bootstrap.ps1 | |
| parent | 1586330395db0bfa14c40c4b1a8d4da6c8f7c5f7 (diff) | |
| parent | 62ed7c17318b4f46109c2de73b7584fb04e85720 (diff) | |
| download | vcpkg-e27fe911982284788e63f4a92339386554706a4b.tar.gz vcpkg-e27fe911982284788e63f4a92339386554706a4b.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump
Diffstat (limited to 'scripts/bootstrap.ps1')
| -rw-r--r-- | scripts/bootstrap.ps1 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index b195cc605..6234efaa3 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -339,7 +339,14 @@ if ($disableMetrics) $platform = "x86" $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release" -$architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture +if($PSVersionTable.PSVersion.Major -le 2) +{ + $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture +} +else +{ + $architecture=(Get-CimInstance win32_operatingsystem | Select-Object osarchitecture).osarchitecture +} if ($win64) { if (-not $architecture -like "*64*") |