Skip to content

FreeBSD improvements and bug fixes #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaxDesiatov merged 3 commits into from
Sep 9, 2025
Merged

FreeBSD improvements and bug fixes #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff7fa0c
Always use `rawValue` when using OS enum as string
CodingCarpincho Sep 8, 2025
b0c10e1
Include FreeBSD version number in derived target triple
CodingCarpincho Sep 8, 2025
3cfd454
Fix capitalization in `GeneratorCLI.swift`
MaxDesiatov Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/GeneratorCLI/GeneratorCLI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,12 @@ extension GeneratorCLI {
)
var freeBSDVersion: String

func deriveTargetTriple(hostTriples: [Triple]) throws -> Triple {
func deriveTargetTriple(hostTriples: [Triple], freeBSDVersion: String) throws -> Triple {
if let target = generatorOptions.target, target.os == .freeBSD {
return target
}
if let arch = generatorOptions.targetArch {
let target = Triple(arch: arch, vendor: nil, os: .freeBSD)
let target = Triple(arch: arch, vendor: nil, os: .freeBSD, version: freeBSDVersion)
appLogger.warning(
"""
Using `--target-arch \(arch)` defaults to `\(target.triple)`. \
Expand All @@ -375,7 +375,7 @@ extension GeneratorCLI {
}

let hostTriples = try self.generatorOptions.deriveHostTriples()
let targetTriple = try self.deriveTargetTriple(hostTriples: hostTriples)
let targetTriple = try self.deriveTargetTriple(hostTriples: hostTriples, freeBSDVersion: self.freeBSDVersion)

let sourceSwiftToolchain: FilePath?
if let fromSwiftToolchain {
Expand Down
7 changes: 7 additions & 0 deletions Sources/SwiftSDKGenerator/PlatformModels/Triple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,19 @@ extension Triple: @unchecked Sendable {}

extension Triple {
public init(arch: Arch, vendor: Vendor?, os: OS, environment: Environment) {
let os = os.rawValue
self.init("\(arch)-\(vendor?.rawValue ?? "unknown")-\(os)-\(environment)", normalizing: true)
}

public init(arch: Arch, vendor: Vendor?, os: OS) {
let os = os.rawValue
self.init("\(arch)-\(vendor?.rawValue ?? "unknown")-\(os)", normalizing: true)
}

public init(arch: Arch, vendor: Vendor?, os: OS, version: String) {
let os = os.rawValue
self.init("\(arch)-\(vendor?.rawValue ?? "unknown")-\(os)\(version)", normalizing: true)
}
}

extension Triple.Arch {
Expand Down