Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit dff460b39a83 · 2025-05-12T08:33:54.000-07:00
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1348,6 +1348,7 @@ function Build-CMakeProject {
       } else {
         Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER (Join-Path -Path (Get-PinnedToolchainToolsDir) -ChildPath  "swiftc.exe")
       }
+      Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
       if (-not ($Platform.OS -eq [OS]::Windows)) {
         Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_WORKS = "YES"
       }

Original file line number	Diff line number	Diff line change
`@@ -1348,6 +1348,7 @@ function Build-CMakeProject {`
`1348`	`1348`	`} else {`
`1349`	`1349`	`Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER (Join-Path -Path (Get-PinnedToolchainToolsDir) -ChildPath "swiftc.exe")`
`1350`	`1350`	`}`
	`1351`	`+ Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"`
`1351`	`1352`	`if (-not ($Platform.OS -eq [OS]::Windows)) {`
`1352`	`1353`	`Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_WORKS = "YES"`
`1353`	`1354`	`}`