tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modify build helper script to fix failing arm builds (#536)

This commit is contained in:
Tess Gauthier 2021-11-03 18:16:28 -04:00 committed by GitHub
parent 2bbcffac6e
commit 45f2b0e099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/win32/openssh/OpenSSHBuildHelper.psm1
View File

@ -207,7 +207,6 @@ function Start-OpenSSHBootstrap
$vcVars = "${env:ProgramFiles(x86)}\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat"
$sdkVersion = Get-Windows10SDKVersion
$env:vctargetspath = "${env:ProgramFiles(x86)}\MSBuild\Microsoft.Cpp\v4.0\v140"
if ($sdkVersion -eq $null)
{
@ -216,10 +215,25 @@ function Start-OpenSSHBootstrap
choco install $packageName --version=$Win10SDKVerChoco -y --force --limitoutput --execution-timeout 120 2>&1 >> $script:BuildLogFile
}
if (-not (Test-Path $env:vctargetspath))
# Using the Win 10 SDK, the x86/x64 builds with VS2015 need vctargetspath to be set.
# For clarity, we set vctargetspath for the arm32/arm64 builds, as well, but it is not required.
if (($NativeHostArch -eq 'x86') -or ($NativeHostArch -eq 'x64'))
{
$env:vctargetspath = "${env:ProgramFiles(x86)}\MSBuild\Microsoft.Cpp\v4.0\v140"
if (-not (Test-Path $env:vctargetspath))
{
Write-BuildMsg -AsInfo -Message "installing visualcpp-build-tools"
choco install visualcpp-build-tools --version 14.0.25420.1 -y --force --limitoutput --execution-timeout 120 2>&1 >> $script:BuildLogFile
}
}
else
{
# msbuildtools have a different path for visual studio versions older than 2017
# for visual studio versions newer than 2017, logic needs to be expanded to update the year in the path accordingly
if ($VS2017Path -ne $null)
{
$env:vctargetspath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCTargets"
}
}
#use vs2017 build tool if exists
@ -521,7 +535,7 @@ function Start-OpenSSHBuild
Remove-Item -Path $script:BuildLogFile -force
}
Start-OpenSSHBootstrap -OneCore:$OneCore
Start-OpenSSHBootstrap -NativeHostArch $NativeHostArch -OneCore:$OneCore
$PathTargets = Join-Path $PSScriptRoot paths.targets
if ($NoOpenSSL)