Skip to content

Commit 620a67a

Browse files
committed
[SwiftPMBuildSystem] Adjust BuildParameters use to indicate a destination
The change is introduced by swiftlang/swift-package-manager#7593
1 parent a29f1ac commit 620a67a

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift

+16-6
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ public actor SwiftPMBuildSystem {
102102
public var projectRoot: TSCAbsolutePath
103103
var modulesGraph: ModulesGraph
104104
let workspace: Workspace
105-
public let buildParameters: BuildParameters
105+
public let toolsBuildParameters: BuildParameters
106+
public let destinationBuildParameters: BuildParameters
106107
let fileSystem: FileSystem
107108
private let toolchainRegistry: ToolchainRegistry
108109

@@ -200,7 +201,16 @@ public actor SwiftPMBuildSystem {
200201
buildConfiguration = .release
201202
}
202203

203-
self.buildParameters = try BuildParameters(
204+
self.toolsBuildParameters = try BuildParameters(
205+
destination: .host,
206+
dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent),
207+
configuration: buildConfiguration,
208+
toolchain: toolchain,
209+
flags: buildSetup.flags
210+
)
211+
212+
self.destinationBuildParameters = try BuildParameters(
213+
destination: .target,
204214
dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent),
205215
configuration: buildConfiguration,
206216
toolchain: toolchain,
@@ -282,8 +292,8 @@ extension SwiftPMBuildSystem {
282292
)
283293

284294
let plan = try BuildPlan(
285-
productsBuildParameters: buildParameters,
286-
toolsBuildParameters: buildParameters,
295+
productsBuildParameters: destinationBuildParameters,
296+
toolsBuildParameters: toolsBuildParameters,
287297
graph: modulesGraph,
288298
fileSystem: fileSystem,
289299
observabilityScope: observabilitySystem.topScope
@@ -347,11 +357,11 @@ extension SwiftPMBuildSystem {
347357
extension SwiftPMBuildSystem: SKCore.BuildSystem {
348358

349359
public var buildPath: TSCAbsolutePath {
350-
return TSCAbsolutePath(buildParameters.buildPath)
360+
return TSCAbsolutePath(destinationBuildParameters.buildPath)
351361
}
352362

353363
public var indexStorePath: TSCAbsolutePath? {
354-
return buildParameters.indexStoreMode == .off ? nil : TSCAbsolutePath(buildParameters.indexStore)
364+
return destinationBuildParameters.indexStoreMode == .off ? nil : TSCAbsolutePath(destinationBuildParameters.indexStore)
355365
}
356366

357367
public var indexDatabasePath: TSCAbsolutePath? {

0 commit comments

Comments
 (0)