Skip to content

Commit 88b7a89

Browse files
committed
windows: append WinSDK after creating directories
Otherwise, we'll end up with two ARM stage/output directories (one of which will be empty).
1 parent 4ad3bbb commit 88b7a89

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

windows/build.ps1

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ if (-Not (Test-Path $GPG)) {
7878
if ($Arch -eq "ARM" -and [string]::IsNullOrEmpty($WinSDK)) {
7979
$WinSDK = '10.0.22621.0'
8080
}
81-
# Override Windows SDK version if $WinSDK is set.
82-
if (-Not ([string]::IsNullOrEmpty($WinSDK))) {
83-
$Arch = "$Arch,version=$WinSDK"
84-
}
8581

8682
Write-Host "WinSDK: $WinSDK"
8783
Write-Host "Config: $Config"
@@ -112,6 +108,11 @@ New-Item -Type Directory "${OUTPUT}" -Force
112108
New-Item -Type Directory "${OUTPUT}\${Arch}" -Force
113109
New-Item -Type Directory "${OUTPUT}\${Arch}\${Type}" -force
114110

111+
# Override Windows SDK version if $WinSDK is set.
112+
if (-Not ([string]::IsNullOrEmpty($WinSDK))) {
113+
$Arch = "$Arch,version=$WinSDK"
114+
}
115+
115116
# Fetch and verify dependencies.
116117
Push-Location ${BUILD}
117118
try {

0 commit comments

Comments
 (0)