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

Bootstrap: Refining PreferredToolArchitecture (#6398)

Browse Source 
* Patch to enable bootstrap on Win32

* [bootstrap-vcpkg] Test OS version to set PreferredToolArchitecture
This commit is contained in:
ccorn 2019-05-21 00:48:59 +02:00 committed by Robert Schumacher
parent 3c9cd10293
commit b0b895bff6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/bootstrap.ps1
View File

@ -339,10 +339,9 @@ if ($disableMetrics)
$platform = "x86"
$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release"
$architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
if ($win64)
{
$architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
if (-not $architecture -like "*64*")
{
throw "Cannot build 64-bit on non-64-bit system"
@ -352,6 +351,15 @@ if ($win64)
$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release"
}
if ($architecture -like "*64*")
{
$PreferredToolArchitecture = "x64"
}
else
{
$PreferredToolArchitecture = "x86"
}
$arguments = (
"`"/p:VCPKG_VERSION=-nohash`"",
"`"/p:DISABLE_METRICS=$disableMetricsValue`"",
@ -359,7 +367,7 @@ $arguments = (
"/p:Platform=$platform",
"/p:PlatformToolset=$platformToolset",
"/p:TargetPlatformVersion=$windowsSDK",
"/p:PreferredToolArchitecture=x64",
"/p:PreferredToolArchitecture=$PreferredToolArchitecture",
"/verbosity:minimal",
"/m",
"/nologo",