Skip to content

Lookup unix fallback toolchain relative to SWIFT_EXEC when set #589

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 1 commit into
base: main
Choose a base branch
from
Open

Lookup unix fallback toolchain relative to SWIFT_EXEC when set #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 37 additions & 32 deletions Sources/SWBGenericUnixPlatform/Plugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,39 +129,44 @@ struct GenericUnixToolchainRegistryExtension: ToolchainRegistryExtension {

let fs = context.fs

if let swift = StackedSearchPath(environment: .current, fs: fs).lookup(Path("swift")), fs.exists(swift) {
let realSwiftPath = try fs.realpath(swift).dirname.normalize()
let hasUsrBin = realSwiftPath.str.hasSuffix("/usr/bin")
let hasUsrLocalBin = realSwiftPath.str.hasSuffix("/usr/local/bin")
let path: Path
switch (hasUsrBin, hasUsrLocalBin) {
case (true, false):
path = realSwiftPath.dirname.dirname
case (false, true):
path = realSwiftPath.dirname.dirname.dirname
case (false, false):
throw StubError.error("Unexpected toolchain layout for Swift installation path: \(realSwiftPath)")
case (true, true):
preconditionFailure()
for swift in [
Environment.current["SWIFT_EXEC"].map(Path.init),
StackedSearchPath(environment: .current, fs: fs).lookup(Path("swift"))
].compactMap(\.self) {
if fs.exists(swift) {
let realSwiftPath = try fs.realpath(swift).dirname.normalize()
let hasUsrBin = realSwiftPath.str.hasSuffix("/usr/bin")
let hasUsrLocalBin = realSwiftPath.str.hasSuffix("/usr/local/bin")
let path: Path
switch (hasUsrBin, hasUsrLocalBin) {
case (true, false):
path = realSwiftPath.dirname.dirname
case (false, true):
path = realSwiftPath.dirname.dirname.dirname
case (false, false):
throw StubError.error("Unexpected toolchain layout for Swift installation path: \(realSwiftPath)")
case (true, true):
preconditionFailure()
}
let llvmDirectories = try Array(fs.listdir(Path("/usr/lib")).filter { $0.hasPrefix("llvm-") }.sorted().reversed())
let llvmDirectoriesLocal = try Array(fs.listdir(Path("/usr/local")).filter { $0.hasPrefix("llvm") }.sorted().reversed())
return [
Toolchain(
identifier: ToolchainRegistry.defaultToolchainIdentifier,
displayName: "Default",
version: Version(),
aliases: ["default"],
path: path,
frameworkPaths: [],
libraryPaths: llvmDirectories.map { "/usr/lib/\($0)/lib" } + llvmDirectoriesLocal.map { "/usr/local/\($0)/lib" } + ["/usr/lib64"],
defaultSettings: [:],
overrideSettings: [:],
defaultSettingsWhenPrimary: [:],
executableSearchPaths: realSwiftPath.dirname.relativeSubpath(from: path).map { [path.join($0).join("bin")] } ?? [],
testingLibraryPlatformNames: [],
fs: fs)
]
}
let llvmDirectories = try Array(fs.listdir(Path("/usr/lib")).filter { $0.hasPrefix("llvm-") }.sorted().reversed())
let llvmDirectoriesLocal = try Array(fs.listdir(Path("/usr/local")).filter { $0.hasPrefix("llvm") }.sorted().reversed())
return [
Toolchain(
identifier: ToolchainRegistry.defaultToolchainIdentifier,
displayName: "Default",
version: Version(),
aliases: ["default"],
path: path,
frameworkPaths: [],
libraryPaths: llvmDirectories.map { "/usr/lib/\($0)/lib" } + llvmDirectoriesLocal.map { "/usr/local/\($0)/lib" } + ["/usr/lib64"],
defaultSettings: [:],
overrideSettings: [:],
defaultSettingsWhenPrimary: [:],
executableSearchPaths: realSwiftPath.dirname.relativeSubpath(from: path).map { [path.join($0).join("bin")] } ?? [],
testingLibraryPlatformNames: [],
fs: fs)
]
}

return []
Expand Down
Loading