Skip to content

Commit 4183eca

Browse files
authored
Merge pull request swiftlang#84417 from compnerd/stage
build.ps1: stage static library artifacts
2 parents e008b38 + bfcabd4 commit 4183eca

File tree

1 file changed

+31
-0
lines changed

1 file changed

+31
-0
lines changed

utils/build.ps1

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3785,6 +3785,37 @@ function Install-HostToolchain() {
37853785
Copy-Item -Force `
37863786
-Path $SwiftDriver `
37873787
-Destination "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swiftc.exe"
3788+
3789+
# Copy static dependencies
3790+
if ($Windows) {
3791+
foreach ($Build in $WindowsSDKBuilds) {
3792+
$SDKROOT = Get-SwiftSDK $Build.OS -Identifier "$($Build.OS)Experimental"
3793+
Copy-Item -Force `
3794+
-Path "${BinaryCache}\$($Build.Triple)\curl\lib\libcurl.lib" `
3795+
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libcurl.lib" | Out-Null
3796+
Copy-Item -Force `
3797+
-Path "${BinaryCache}\$($Build.Triple)\libxml2-2.11.5\libxml2s.lib" `
3798+
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libxml2s.lib" | Out-Null
3799+
Copy-Item -Force `
3800+
-Path "${BinaryCache}\$($Build.Triple)\zlib\zlibstatic.lib" `
3801+
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\zlibstatic.lib" | Out-Null
3802+
}
3803+
}
3804+
3805+
if ($Android) {
3806+
foreach ($Build in $AndroidSDKBuilds) {
3807+
$SDKROOT = Get-SwiftSDK $Build.OS -Identifier "$($Build.OS)Experimental"
3808+
Copy-Item -Force `
3809+
-Path "${BinaryCache}\$($Build.Triple)\curl\lib\libcurl.a" `
3810+
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libcurl.a" | Out-Null
3811+
Copy-Item -Force `
3812+
-Path "${BinaryCache}\$($Build.Triple)\libxml2-2.11.5\libxml2.a" `
3813+
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libxml2.a" | Out-Null
3814+
Copy-Item -Force `
3815+
-Path "${BinaryCache}\$($Build.Triple)\zlib\libz.a" `
3816+
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libz.a" | Out-Null
3817+
}
3818+
}
37883819
}
37893820

37903821
function Build-Inspect([Hashtable] $Platform) {

0 commit comments

Comments
 (0)