Merge pull request #987 from neonichu/move-swiftmodule-output-directory

neonichu · web-flow · commit 9ed43df2766a · 2023-12-07T11:21:57.000-05:00
Adjust arguments based on move of SwiftPM's module output directory
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
@@ -449,7 +449,7 @@ extension SwiftPMWorkspace {
     }
     args += ["-c"]
     args += td.sources.map { $0.pathString }
-    args += ["-I", buildPath.pathString]
+    args += ["-I", td.moduleOutputPath.parentDirectory.pathString]
     args += try td.compileArguments()
 
     return FileBuildSettings(
diff --git a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift b/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
@@ -159,7 +159,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       check("-target", hostTriple.tripleString, arguments: arguments)
       #endif
 
-      check("-I", build.pathString, arguments: arguments)
+      check("-I", build.appending(component: "Modules").pathString, arguments: arguments)
 
       check(aswift.pathString, arguments: arguments)
     }

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ extension SwiftPMWorkspace {`
`449`	`449`	`}`
`450`	`450`	`args += ["-c"]`
`451`	`451`	`args += td.sources.map { $0.pathString }`
`452`		`- args += ["-I", buildPath.pathString]`
	`452`	`+ args += ["-I", td.moduleOutputPath.parentDirectory.pathString]`
`453`	`453`	`args += try td.compileArguments()`
`454`	`454`
`455`	`455`	`return FileBuildSettings(`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {`
`159`	`159`	`check("-target", hostTriple.tripleString, arguments: arguments)`
`160`	`160`	`#endif`
`161`	`161`
`162`		`- check("-I", build.pathString, arguments: arguments)`
	`162`	`+ check("-I", build.appending(component: "Modules").pathString, arguments: arguments)`
`163`	`163`
`164`	`164`	`check(aswift.pathString, arguments: arguments)`
`165`	`165`	`}`