Skip to content

Commit ef5ce43

Browse files
committed
removed unnecessary variable
1 parent c6da47b commit ef5ce43

File tree

5 files changed

+1
-9
lines changed

5 files changed

+1
-9
lines changed

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ public final class SwiftTargetBuildDescription {
647647

648648
// rdar://115777026
649649
// 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() {
651651
args += ["-sdk", sdkPath.pathString]
652652
}
653653

Sources/CoreCommands/SwiftTool.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,6 @@ public final class SwiftTool {
695695

696696
return try BuildParameters(
697697
dataPath: dataPath,
698-
sdkPath: toolchain.sdkRootPath,
699698
configuration: options.build.configuration,
700699
toolchain: toolchain,
701700
triple: triple,

Sources/SPMBuildCore/BuildParameters/BuildParameters.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ public struct BuildParameters: Encodable {
2929
/// The path to the data directory.
3030
public var dataPath: AbsolutePath
3131

32-
/// The path to the SDKROOT directory.
33-
public var sdkPath: AbsolutePath?
34-
3532
/// The build configuration.
3633
public var configuration: BuildConfiguration
3734

@@ -122,7 +119,6 @@ public struct BuildParameters: Encodable {
122119

123120
public init(
124121
dataPath: AbsolutePath,
125-
sdkPath: AbsolutePath?,
126122
configuration: BuildConfiguration,
127123
toolchain: Toolchain,
128124
triple: Triple? = nil,
@@ -149,7 +145,6 @@ public struct BuildParameters: Encodable {
149145
)
150146

151147
self.dataPath = dataPath
152-
self.sdkPath = toolchain.sdkRootPath
153148
self.configuration = configuration
154149
self._toolchain = _Toolchain(toolchain: toolchain)
155150
self.triple = triple

Sources/SPMTestSupport/MockBuildTestHelper.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public func mockBuildParameters(
8585
) -> BuildParameters {
8686
try! BuildParameters(
8787
dataPath: buildPath,
88-
sdkPath: toolchain.sdkRootPath,
8988
configuration: config,
9089
toolchain: toolchain,
9190
triple: targetTriple,

Sources/swift-bootstrap/main.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ struct SwiftBootstrapBuildTool: ParsableCommand {
279279

280280
let buildParameters = try BuildParameters(
281281
dataPath: dataPath,
282-
sdkPath: self.targetToolchain.sdkRootPath,
283282
configuration: configuration,
284283
toolchain: self.targetToolchain,
285284
triple: self.hostToolchain.targetTriple,

0 commit comments

Comments
 (0)