Skip to content

SDKBuilder: allow a local toolset and OpenAppleMacrosServer (offline sdk build) #319

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

Closed
m9tdev wants to merge 3 commits into from
+34 −9
Closed

SDKBuilder: allow a local toolset and OpenAppleMacrosServer (offline sdk build) #319

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b1ad8f
SDKBuilder: allow local toolset and OpenAppleMacrosServer (offline sd…
m9tdev Oct 11, 2026
fbe451d
SDKBuilder: address review (Subprocess for tar, copy + chmod, no re-i…
m9tdev Oct 13, 2026
acc11fc
SDKBuilder: make XTOOL_TOOLSET_TARBALL absolute (tar runs in toolsetDir)
m9tdev Oct 13, 2026
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
43 changes: 34 additions & 9 deletions Sources/XToolSupport/SDKBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,7 @@ struct SDKBuilder {
}

// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")

try FileManager.default.createDirectory(
at: toolsetDir,
withIntermediateDirectories: false
)

private func downloadToolset(into toolsetDir: URL) async throws {
@Dependency(\.httpClient) var httpClient
Comment thread
kabiroberai marked this conversation as resolved.
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
Expand Down Expand Up @@ -280,6 +273,30 @@ struct SDKBuilder {
try await execution.standardInputWriter.finish()
}
.checkSuccess()
}

private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")

try FileManager.default.createDirectory(
at: toolsetDir,
withIntermediateDirectories: false
)

if let local = ProcessInfo.processInfo.environment["XTOOL_TOOLSET_TARBALL"] {
Comment thread
kabiroberai marked this conversation as resolved.
// absolute: tar runs in toolsetDir, where a relative path would point
let tarball = URL(fileURLWithPath: local).standardizedFileURL.path
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", tarball],
workingDirectory: FilePath(toolsetDir),
output: .discarded,
error: .discarded,
)
.checkSuccess()
} else {
try await downloadToolset(into: toolsetDir)
}

// swift-build assumes we have an Apple-flavored librarian for Apple platforms
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
Expand Down Expand Up @@ -386,6 +403,15 @@ struct SDKBuilder {
}

private func installMacros(in output: URL) async throws {
let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
if let local = ProcessInfo.processInfo.environment["XTOOL_OAM_SERVER"] {
// copyItem copies a symlink as a symlink (it may be relative): copy its target
let source = URL(fileURLWithPath: local).resolvingSymlinksInPath().path
try FileManager.default.copyItem(atPath: source, toPath: outputPath)
// the source may be read-only (e.g. in /nix/store); the copy keeps its mode
try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: outputPath)
return
}
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
Expand All @@ -400,7 +426,6 @@ struct SDKBuilder {
case .unknown: nil
}

let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
do {
let handle = try FileDescriptor.open(
FilePath(outputPath),
Expand Down