Skip to content

Commit 1bd29db

Browse files
committed
vs_2019: for x86 compilation, use the x86 VC Vars
1 parent 52c026c commit 1bd29db

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

BuildAutomation/BuildCloudbaseInitSetup.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ $ErrorActionPreference = "Stop"
1818
$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
1919
. "$scriptPath\BuildUtils.ps1"
2020

21-
SetVCVars "2019" "x86_amd64"
21+
$platformVCVarsRequired = "x86_amd64"
22+
# On Visual Studio 2019, the mixed x86_amd64 VC variables
23+
# make compilation for x86 use the x64 functions
24+
if ($platform -eq "x86") {
25+
$platformVCVarsRequired = "x86"
26+
}
27+
28+
SetVCVars "2019" $platformVCVarsRequired
2229

2330
# Needed for SSH
2431
$ENV:HOME = $ENV:USERPROFILE

0 commit comments

Comments
 (0)