Commit 3bc16fa
authored
[6.2] Ensure the path to Swift Testing's macro plugin is specified correctly when using a non-default Xcode toolchain (#606)
This resolves an issue which can occur when using Xcode 26 Beta with the downloadable Metal toolchain installed, if a target imports Swift Testing. A toolchain override is specified in this scenario, and this causes the existing logic modified by this PR to incorrectly believe it's using a non-Xcode toolchain, which in turn causes the wrong Swift macro plugin flags to be passed, ultimately leading to a failure locating the `TestingMacros` plugin.
The fix is to recognize all toolchains which have Xcode's prefix, and ensure the default toolchain prefix is used whenever any Xcode toolchain is in use.
Fixes rdar://1520881641 parent 2dda86e commit 3bc16fa
1 file changed
+13
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4279 | 4279 | | |
4280 | 4280 | | |
4281 | 4281 | | |
4282 | | - | |
| 4282 | + | |
| 4283 | + | |
| 4284 | + | |
4283 | 4285 | | |
4284 | 4286 | | |
4285 | 4287 | | |
4286 | 4288 | | |
4287 | | - | |
| 4289 | + | |
4288 | 4290 | | |
4289 | 4291 | | |
4290 | 4292 | | |
4291 | | - | |
4292 | | - | |
| 4293 | + | |
| 4294 | + | |
| 4295 | + | |
4293 | 4296 | | |
4294 | 4297 | | |
4295 | 4298 | | |
| |||
4298 | 4301 | | |
4299 | 4302 | | |
4300 | 4303 | | |
4301 | | - | |
4302 | | - | |
4303 | | - | |
4304 | | - | |
4305 | | - | |
| 4304 | + | |
| 4305 | + | |
| 4306 | + | |
| 4307 | + | |
| 4308 | + | |
| 4309 | + | |
4306 | 4310 | | |
4307 | 4311 | | |
4308 | 4312 | | |
| |||
0 commit comments