Skip to content

Commit 90287f1

Browse files
Remove linuxConventionDescription conversion (#103)
Now SDK generator users are responsible for providing appropriate triples for their targets, so we don't need to convert them to the Linux convention anymore. Also stop normalizing the triple string given through CLI options to keep the original triple string as is in the generated SDK metadata. This makes it more flexible to support various triple strings like wasm32-unknown-wasip1-threads.
1 parent 6a70ec9 commit 90287f1

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

Sources/GeneratorCLI/GeneratorCLI.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct GeneratorCLI: AsyncParsableCommand {
6464
extension Triple.Arch: ExpressibleByArgument {}
6565
extension Triple: ExpressibleByArgument {
6666
public init?(argument: String) {
67-
self.init(argument, normalizing: true)
67+
self.init(argument, normalizing: false)
6868
}
6969
}
7070

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Metadata.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ extension SwiftSDKGenerator {
7979
encoder.encode(
8080
SwiftSDKMetadataV4(
8181
targetTriples: [
82-
self.targetTriple.linuxConventionDescription: metadata,
82+
self.targetTriple.triple: metadata,
8383
]
8484
)
8585
)
@@ -102,7 +102,7 @@ extension SwiftSDKGenerator {
102102
version: self.bundleVersion,
103103
variants: [
104104
.init(
105-
path: FilePath(artifactID).appending(self.targetTriple.linuxConventionDescription).string,
105+
path: FilePath(artifactID).appending(self.targetTriple.triple).string,
106106
supportedTriples: hostTriples.map { $0.map(\.triple) }
107107
),
108108
]

Sources/SwiftSDKGenerator/PathsConfiguration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public struct PathsConfiguration: Sendable {
2121
self.artifactsCachePath = sourceRoot.appending("Artifacts")
2222
self.swiftSDKRootPath = self.artifactBundlePath
2323
.appending(artifactID)
24-
.appending(targetTriple.linuxConventionDescription)
24+
.appending(targetTriple.triple)
2525
self.toolchainDirPath = self.swiftSDKRootPath.appending("swift.xctoolchain")
2626
self.toolchainBinDirPath = self.toolchainDirPath.appending("usr/bin")
2727
}

Sources/SwiftSDKGenerator/PlatformModels/Triple.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ extension Triple: @unchecked Sendable {}
1818

1919
extension Triple {
2020

21-
public var linuxConventionDescription: String {
22-
"\(self.arch!.linuxConventionName)-\(self.vendor?.rawValue ?? "unknown")-\(self.os!)\(self.environment != nil ? "-\(self.environment!)" : "")"
23-
}
24-
2521
public init(arch: Arch, vendor: Vendor?, os: OS, environment: Environment) {
2622
self.init("\(arch)-\(vendor?.rawValue ?? "unknown")-\(os)-\(environment)", normalizing: true)
2723
}

0 commit comments

Comments
 (0)