Commit 36be463
committed
[6.2] Ensure the path to Swift Testing's macro plugin is specified correctly when using a non-default Xcode toolchain
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 17b53a4 commit 36be463
1 file changed
+13
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4274 | 4274 | | |
4275 | 4275 | | |
4276 | 4276 | | |
4277 | | - | |
| 4277 | + | |
| 4278 | + | |
| 4279 | + | |
4278 | 4280 | | |
4279 | 4281 | | |
4280 | 4282 | | |
4281 | 4283 | | |
4282 | | - | |
| 4284 | + | |
4283 | 4285 | | |
4284 | 4286 | | |
4285 | 4287 | | |
4286 | | - | |
4287 | | - | |
| 4288 | + | |
| 4289 | + | |
| 4290 | + | |
4288 | 4291 | | |
4289 | 4292 | | |
4290 | 4293 | | |
| |||
4293 | 4296 | | |
4294 | 4297 | | |
4295 | 4298 | | |
4296 | | - | |
4297 | | - | |
4298 | | - | |
4299 | | - | |
4300 | | - | |
| 4299 | + | |
| 4300 | + | |
| 4301 | + | |
| 4302 | + | |
| 4303 | + | |
| 4304 | + | |
4301 | 4305 | | |
4302 | 4306 | | |
4303 | 4307 | | |
| |||
0 commit comments