Skip to content

Commit c882b57

Browse files
utils: Move libs to arch-specific SDK directories to avoid multi-lib error with lld (#79913)
1 parent 95ea010 commit c882b57

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

utils/build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3217,8 +3217,8 @@ if (-not $SkipBuild) {
32173217
Invoke-BuildStep Build-ExperimentalRuntime -Static Android $Arch
32183218
Invoke-BuildStep Build-Foundation -Static Android $Arch
32193219

3220-
Copy-File "$(Get-SwiftSDK Android)\usr\lib\swift\android\*.a" "$(Get-SwiftSDK Android)\usr\lib\swift\android\$($Arch.LLVMName)\"
3221-
Copy-File "$(Get-SwiftSDK Android)\usr\lib\swift\android\*.so" "$(Get-SwiftSDK Android)\usr\lib\swift\android\$($Arch.LLVMName)\"
3220+
Move-Item "$(Get-SwiftSDK Android)\usr\lib\swift\android\*.a" "$(Get-SwiftSDK Android)\usr\lib\swift\android\$($Arch.LLVMName)\"
3221+
Move-Item "$(Get-SwiftSDK Android)\usr\lib\swift\android\*.so" "$(Get-SwiftSDK Android)\usr\lib\swift\android\$($Arch.LLVMName)\"
32223222
}
32233223
Install-Platform Android $AndroidSDKArchs
32243224
Invoke-BuildStep Write-PlatformInfoPlist Android

0 commit comments

Comments
 (0)