From 61ad2ce4ff8b2eecb137ccf1635c84d680508ca8 Mon Sep 17 00:00:00 2001 From: Boris Buegling Date: Wed, 6 Dec 2023 08:45:09 -0800 Subject: [PATCH] Adjust arguments based on move of SwiftPM's module output directory --- Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift | 2 +- Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift index cb3fbecb..e9b03561 100644 --- 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 index 230f87ab..be3a6ce3 100644 --- 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) }