File tree Expand file tree Collapse file tree 5 files changed +1
-9
lines changed
SPMBuildCore/BuildParameters Expand file tree Collapse file tree 5 files changed +1
-9
lines changed Original file line number Diff line number Diff line change @@ -647,7 +647,7 @@ public final class SwiftTargetBuildDescription {
647
647
648
648
// rdar://115777026
649
649
// Compiler commands need to track SDK dependencies to trigger rebuilds when the SDK changes
650
- if let sdkPath = self . buildParameters. sdkPath , self . buildParameters. targetTriple . isDarwin ( ) {
650
+ if let sdkPath = self . buildParameters. toolchain . sdkRootPath , self . buildParameters. triple . isDarwin ( ) {
651
651
args += [ " -sdk " , sdkPath. pathString]
652
652
}
653
653
Original file line number Diff line number Diff line change @@ -695,7 +695,6 @@ public final class SwiftTool {
695
695
696
696
return try BuildParameters (
697
697
dataPath: dataPath,
698
- sdkPath: toolchain. sdkRootPath,
699
698
configuration: options. build. configuration,
700
699
toolchain: toolchain,
701
700
triple: triple,
Original file line number Diff line number Diff line change @@ -29,9 +29,6 @@ public struct BuildParameters: Encodable {
29
29
/// The path to the data directory.
30
30
public var dataPath : AbsolutePath
31
31
32
- /// The path to the SDKROOT directory.
33
- public var sdkPath : AbsolutePath ?
34
-
35
32
/// The build configuration.
36
33
public var configuration : BuildConfiguration
37
34
@@ -122,7 +119,6 @@ public struct BuildParameters: Encodable {
122
119
123
120
public init (
124
121
dataPath: AbsolutePath ,
125
- sdkPath: AbsolutePath ? ,
126
122
configuration: BuildConfiguration ,
127
123
toolchain: Toolchain ,
128
124
triple: Triple ? = nil ,
@@ -149,7 +145,6 @@ public struct BuildParameters: Encodable {
149
145
)
150
146
151
147
self . dataPath = dataPath
152
- self . sdkPath = toolchain. sdkRootPath
153
148
self . configuration = configuration
154
149
self . _toolchain = _Toolchain ( toolchain: toolchain)
155
150
self . triple = triple
Original file line number Diff line number Diff line change @@ -85,7 +85,6 @@ public func mockBuildParameters(
85
85
) -> BuildParameters {
86
86
try ! BuildParameters (
87
87
dataPath: buildPath,
88
- sdkPath: toolchain. sdkRootPath,
89
88
configuration: config,
90
89
toolchain: toolchain,
91
90
triple: targetTriple,
Original file line number Diff line number Diff line change @@ -279,7 +279,6 @@ struct SwiftBootstrapBuildTool: ParsableCommand {
279
279
280
280
let buildParameters = try BuildParameters (
281
281
dataPath: dataPath,
282
- sdkPath: self . targetToolchain. sdkRootPath,
283
282
configuration: configuration,
284
283
toolchain: self . targetToolchain,
285
284
triple: self . hostToolchain. targetTriple,
You can’t perform that action at this time.
0 commit comments