Skip to content

Commit bde8791

Browse files
authored
Revert "generator/linux: Use swiftResourcesPath to find framework headers (…" (#142)
This reverts commit 2ae9e21.
1 parent 2ae9e21 commit bde8791

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Copy.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ extension SwiftSDKGenerator {
101101
("swift/linux", pathsConfiguration.toolchainDirPath.appending("usr/lib/swift")),
102102
("swift_static/linux", pathsConfiguration.toolchainDirPath.appending("usr/lib/swift_static")),
103103
("swift_static/shims", pathsConfiguration.toolchainDirPath.appending("usr/lib/swift_static")),
104+
("swift/dispatch", sdkDirPath.appending("usr/include")),
105+
("swift/os", sdkDirPath.appending("usr/include")),
106+
("swift/CoreFoundation", sdkDirPath.appending("usr/include")),
104107
] {
105108
try await rsync(from: distributionPath.appending(pathWithinPackage), to: pathWithinSwiftSDK)
106109
}

Sources/SwiftSDKGenerator/SwiftSDKRecipes/LinuxRecipe.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,6 @@ public struct LinuxRecipe: SwiftSDKRecipe {
115115
toolset.librarian = Toolset.ToolProperties(path: "llvm-ar")
116116
}
117117

118-
public func applyPlatformOptions(
119-
metadata: inout SwiftSDKMetadataV4.TripleProperties,
120-
paths: PathsConfiguration,
121-
targetTriple: Triple
122-
) {
123-
var relativeSDKDir = self.sdkDirPath(paths: paths)
124-
guard relativeSDKDir.removePrefix(paths.swiftSDKRootPath) else {
125-
fatalError("The SDK directory path must be a subdirectory of the Swift SDK root path.")
126-
}
127-
metadata.swiftResourcesPath = relativeSDKDir.appending("usr/lib/swift").string
128-
metadata.swiftStaticResourcesPath = relativeSDKDir.appending("usr/lib/swift_static").string
129-
}
130-
131118
public var defaultArtifactID: String {
132119
"""
133120
\(self.versionsConfiguration.swiftVersion)_\(self.linuxDistribution.name.rawValue)_\(

0 commit comments

Comments
 (0)