Skip to content

Unskip building docc for cross-compiling on Windows #84912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
+13 −5
Closed

Unskip building docc for cross-compiling on Windows #84912

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
370584a
Unskip building docc for cross-compiling on Windows
jakepetroules Oct 15, 2025
988e3d3
Remove $RuntimeInstallRoot\usr\bin from the PATH used to find `swift …
jakepetroules Oct 22, 2025
195662f
Don't set PATH at all, and set --target
jakepetroules Oct 22, 2025
8b50215
Try to set the PATH correctly again
jakepetroules Oct 23, 2025
6cc5c12
Update SDKROOT environment variable assignment to use pinned toolchai…
jakepetroules Oct 23, 2025
5fd62a7
Refactor build script for environment variable handling
jakepetroules Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,10 +1963,6 @@ function Build-SPMProject {
$Stopwatch = [Diagnostics.Stopwatch]::StartNew()

Invoke-IsolatingEnvVars {
$RuntimeInstallRoot = [IO.Path]::Combine((Get-InstallDir $BuildPlatform), "Runtimes", $ProductVersion)

$env:Path = "$RuntimeInstallRoot\usr\bin;$($BuildPlatform.ToolchainInstallRoot)\usr\bin;${env:Path}"
$env:SDKROOT = (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK)
$env:SWIFTCI_USE_LOCAL_DEPS = "1"

$Arguments = @(
Expand Down Expand Up @@ -1997,6 +1993,18 @@ function Build-SPMProject {
}
}

if ($ActionName -eq "build") {
# For building, we are cross-compiling content using the pinned to ship as part of the toolchain
$env:Path = "$(Get-PinnedToolchainRuntime);$(Get-PinnedToolchainToolsDir);${env:Path}"
$env:SDKROOT = (Get-PinnedToolchainSDK -OS $BuildPlatform.OS)
$Arguments += @("--triple", "$($Platform.Triple)")
} else {
# For testing, we are doing this using the just-built toolchain and only when NOT cross-compiling
$RuntimeInstallRoot = [IO.Path]::Combine((Get-InstallDir $BuildPlatform), "Runtimes", $ProductVersion)
$env:Path = "$RuntimeInstallRoot\usr\bin;$($BuildPlatform.ToolchainInstallRoot)\usr\bin;${env:Path}"
$env:SDKROOT = (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK)
}

Invoke-Program swift $ActionName @Arguments @AdditionalArguments
}

Expand Down Expand Up @@ -4322,7 +4330,7 @@ if (-not $SkipBuild -and $IncludeNoAsserts) {
Build-NoAssertsToolchain
}

if (-not $SkipBuild -and -not $IsCrossCompiling) {
if (-not $SkipBuild) {
Invoke-BuildStep Build-DocC $HostPlatform
}

Expand Down