Fix plugin with custom task invocation using swiftbuild on windows

daveinglis · daveinglis · commit 92d1b16f8711 · 2026-01-05T16:42:25.000-05:00
- need to add .exe prefix to .builtTool binary so swiftbuild/llbuild file inputs are correct. closes: #9189 rdar://161337478
diff --git a/Sources/SPMBuildCore/Plugins/PluginInvocation.swift b/Sources/SPMBuildCore/Plugins/PluginInvocation.swift
@@ -697,7 +697,8 @@ fileprivate func collectAccessibleTools(
         }
         // For an executable target we create a `builtTool`.
         else if executableOrBinaryModule.type == .executable {
-            return try [.builtTool(name: builtToolName, path: RelativePath(validating: executableOrBinaryModule.name))]
+            let exeName = executableOrBinaryModule.name + hostTriple.executableExtension
+            return try [.builtTool(name: builtToolName, path: RelativePath(validating: exeName))]
         }
         else {
             return []
diff --git a/Tests/FunctionalTests/PluginTests.swift b/Tests/FunctionalTests/PluginTests.swift
@@ -380,7 +380,6 @@ struct PluginTests {
     @Test(
         .issue("https://github.com/swiftlang/swift-package-manager/issues/9215", relationship: .verifies),
         .requiresSwiftConcurrencySupport,
-        .disabled("rdar://162053979"),
         arguments: [BuildSystemProvider.Kind.native, .swiftbuild]
     )
     func testUseOfVendedBinaryTool(buildSystem: BuildSystemProvider.Kind) async throws {

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,8 @@ fileprivate func collectAccessibleTools(`
`697`	`697`	`}`
`698`	`698`	// For an executable target we create a `builtTool`.
`699`	`699`	`else if executableOrBinaryModule.type == .executable {`
`700`		`- return try [.builtTool(name: builtToolName, path: RelativePath(validating: executableOrBinaryModule.name))]`
	`700`	`+ let exeName = executableOrBinaryModule.name + hostTriple.executableExtension`
	`701`	`+ return try [.builtTool(name: builtToolName, path: RelativePath(validating: exeName))]`
`701`	`702`	`}`
`702`	`703`	`else {`
`703`	`704`	`return []`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,6 @@ struct PluginTests {`
`380`	`380`	`@Test(`
`381`	`381`	`.issue("https://github.com/swiftlang/swift-package-manager/issues/9215", relationship: .verifies),`
`382`	`382`	`.requiresSwiftConcurrencySupport,`
`383`		`- .disabled("rdar://162053979"),`
`384`	`383`	`arguments: [BuildSystemProvider.Kind.native, .swiftbuild]`
`385`	`384`	`)`
`386`	`385`	`func testUseOfVendedBinaryTool(buildSystem: BuildSystemProvider.Kind) async throws {`