3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 10:58:09 +08:00
Code Issues Projects Releases Wiki Activity

Win7 compat. Fail if 64-bit requested on 32-bit machine

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-06-13 11:54:33 -07:00
parent e7721cde19
commit 4a4215c2e5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/bootstrap.ps1
View File

@ -329,15 +329,18 @@ if ($disableMetrics)
$platform = "x86" $platform = "x86"
$vcpkgReleaseDir = "$vcpkgSourcesPath\release" $vcpkgReleaseDir = "$vcpkgSourcesPath\release"
# x86_64 architecture is 9
$architecture=(Get-WmiObject win32_Processor -ErrorAction SilentlyContinue).Architecture
if ([Environment]::Is64BitOperatingSystem -and $architecture -eq 9 -and $win64) if ($win64)
{ {
$platform = "x64" $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
$vcpkgReleaseDir = "$vcpkgSourcesPath\x64\Release" if ($architecture -ne "64-bit")
} {
throw "Cannot build 64-bit on non-64-bit system"
}
$platform = "x64"
$vcpkgReleaseDir = "$vcpkgSourcesPath\x64\release"
}
$arguments = ( $arguments = (
"`"/p:VCPKG_VERSION=-nohash`"", "`"/p:VCPKG_VERSION=-nohash`"",