Skip to content

Remove llvm-ar librarian path from Swift SDK built with no host toolchain included #240

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove llvm-ar librarian path from Swift SDK built with no host toolchain included #240

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
bdc3a80
Don't include librarian path to llvm-ar when using preinstalled Swift…
xtremekforever Aug 29, 2025
ef2441e
Modify preinstalled SDK Linux test to show that no librarian path is …
xtremekforever Aug 31, 2025
e58f56c
Merge branch 'main' into #233-llvm-ar-workaround
MaxDesiatov Sep 1, 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
7 changes: 6 additions & 1 deletion Sources/SwiftSDKGenerator/SwiftSDKRecipes/LinuxRecipe.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,12 @@ package struct LinuxRecipe: SwiftSDKRecipe {
toolset.swiftCompiler = Toolset.ToolProperties(extraCLIOptions: swiftCompilerOptions)

toolset.cxxCompiler = Toolset.ToolProperties(extraCLIOptions: ["-lstdc++"])
toolset.librarian = Toolset.ToolProperties(path: "llvm-ar")

// Don't include path to librarian if we're using the preinstalled toolchain
// Workaround for https://github.com/swiftlang/swift-package-manager/issues/9035
if self.hostSwiftSource != .preinstalled {
toolset.librarian = Toolset.ToolProperties(path: "llvm-ar")
}
}

package func applyPlatformOptions(
Expand Down
2 changes: 1 addition & 1 deletion Tests/SwiftSDKGeneratorTests/SwiftSDKRecipes/LinuxRecipeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ final class LinuxRecipeTests: XCTestCase {
]
)
XCTAssertEqual(toolset.cxxCompiler?.extraCLIOptions, ["-lstdc++"])
XCTAssertEqual(toolset.librarian?.path, "llvm-ar")
XCTAssert(toolset.librarian == nil)
XCTAssert(toolset.linker == nil)
}

Expand Down