diff options
| author | myd7349 <myd7349@gmail.com> | 2019-07-02 18:13:44 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-07-02 18:13:44 +0800 |
| commit | 086c72777369e9a8db0a58e4ad43360b3b613c78 (patch) | |
| tree | 240047d021f2e08af14d58b8a6a5db4b6f0fda60 /scripts/bootstrap.ps1 | |
| parent | 3efdcef0e62aa6df7ff9088c001cff8d47304386 (diff) | |
| parent | f15d52becf620a0b234b4b7735579b5415f8d7b7 (diff) | |
| download | vcpkg-086c72777369e9a8db0a58e4ad43360b3b613c78.tar.gz vcpkg-086c72777369e9a8db0a58e4ad43360b3b613c78.zip | |
Merge branch 'master' into rdkafka-init
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*") |