Merge pull request #85594 from compnerd/dynamic-only

compnerd · web-flow · commit 86fb7acc566b · 2025-11-19T16:34:26.000-08:00
utils: clean up static library elision
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -4321,12 +4321,12 @@ if (-not $SkipBuild) {
           foreach ($Build in $WindowsSDKBuilds) {
             Invoke-BuildStep Build-ExperimentalSDK $Build
 
-            Get-ChildItem "${SDKROOT}\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
+            Get-ChildItem -ErrorAction Ignore "${SDKROOT}\usr\lib\swift\windows" -Filter "*.lib" -File | ForEach-Object {
               Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
               Move-Item $_.FullName "${SDKROOT}\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null
             }
 
-            Get-ChildItem "${SDKROOT}\usr\lib\swift_static\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object {
+            Get-ChildItem -ErrorAction Ignore "${SDKROOT}\usr\lib\swift_static\windows" -Filter "*.lib" -File | ForEach-Object {
               Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
               Move-Item $_.FullName "${SDKROOT}\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" | Out-Null
             }
@@ -4403,7 +4403,7 @@ if (-not $SkipBuild) {
               Move-Item $_.FullName "${SDKROOT}\usr\lib\swift\android\$($Build.Architecture.LLVMName)\" | Out-Null
             }
 
-            Get-ChildItem "${SDKROOT}\usr\lib\swift_static\android" -File | Where-Object { $_.Name -match ".a$|.so$" } | ForEach-Object {
+            Get-ChildItem -ErrorAction Ignore "${SDKROOT}\usr\lib\swift_static\android" -File | Where-Object { $_.Name -match ".a$|.so$" } | ForEach-Object {
               Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"
               Move-Item $_.FullName "${SDKROOT}\usr\lib\swift_static\android\$($Build.Architecture.LLVMName)\" | Out-Null
             }

Original file line number	Diff line number	Diff line change
`@@ -4321,12 +4321,12 @@ if (-not $SkipBuild) {`
`4321`	`4321`	`foreach ($Build in $WindowsSDKBuilds) {`
`4322`	`4322`	`Invoke-BuildStep Build-ExperimentalSDK $Build`
`4323`	`4323`
`4324`		`- Get-ChildItem "${SDKROOT}\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore \| ForEach-Object {`
	`4324`	`+ Get-ChildItem -ErrorAction Ignore "${SDKROOT}\usr\lib\swift\windows" -Filter "*.lib" -File \| ForEach-Object {`
`4325`	`4325`	`Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"`
`4326`	`4326`	`Move-Item $_.FullName "${SDKROOT}\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" \| Out-Null`
`4327`	`4327`	`}`
`4328`	`4328`
`4329`		`- Get-ChildItem "${SDKROOT}\usr\lib\swift_static\windows" -Filter "*.lib" -File -ErrorAction Ignore \| ForEach-Object {`
	`4329`	`+ Get-ChildItem -ErrorAction Ignore "${SDKROOT}\usr\lib\swift_static\windows" -Filter "*.lib" -File \| ForEach-Object {`
`4330`	`4330`	`Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"`
`4331`	`4331`	`Move-Item $_.FullName "${SDKROOT}\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" \| Out-Null`
`4332`	`4332`	`}`
`@@ -4403,7 +4403,7 @@ if (-not $SkipBuild) {`
`4403`	`4403`	`Move-Item $_.FullName "${SDKROOT}\usr\lib\swift\android\$($Build.Architecture.LLVMName)\" \| Out-Null`
`4404`	`4404`	`}`
`4405`	`4405`
`4406`		`- Get-ChildItem "${SDKROOT}\usr\lib\swift_static\android" -File \| Where-Object { $_.Name -match ".a$\|.so$" } \| ForEach-Object {`
	`4406`	`+ Get-ChildItem -ErrorAction Ignore "${SDKROOT}\usr\lib\swift_static\android" -File \| Where-Object { $_.Name -match ".a$\|.so$" } \| ForEach-Object {`
`4407`	`4407`	`Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory"`
`4408`	`4408`	`Move-Item $_.FullName "${SDKROOT}\usr\lib\swift_static\android\$($Build.Architecture.LLVMName)\" \| Out-Null`
`4409`	`4409`	`}`