Skip to content

Commit 4a98e37

Browse files
committed
Fix the runtime and the SDK paths for the swift build compiler case
This fix is necessary for the native win arm64 build where arm64 isn't the first in the WindowsSDKs list.
1 parent 283ce7f commit 4a98e37

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

utils/build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ function Build-CMakeProject {
12011201
}
12021202

12031203
if ($UseBuiltCompilers.Contains("Swift")) {
1204-
$env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $Arch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
1204+
$env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $BuildArch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;$(Get-PinnedToolchainRuntime);${env:Path}"
12051205
} elseif ($UsePinnedCompilers.Contains("Swift")) {
12061206
$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
12071207
}
@@ -1969,7 +1969,7 @@ function Build-FoundationMacros() {
19691969

19701970
$SwiftSDK = $null
19711971
if ($Build) {
1972-
$SwiftSDK = $BuildArch.SDKInstallRoot
1972+
$SwiftSDK = $(Get-PinnedToolchainSDK)
19731973
}
19741974

19751975
$InstallDir = $null
@@ -2605,7 +2605,7 @@ function Build-TestingMacros() {
26052605

26062606
$SwiftSDK = $null
26072607
if ($Build) {
2608-
$SwiftSDK = $BuildArch.SDKInstallRoot
2608+
$SwiftSDK = $(Get-PinnedToolchainSDK)
26092609
}
26102610

26112611
$Targets = if ($Build) {

0 commit comments

Comments
 (0)