Skip to content

[CAS] Fix pluginCAS initialization #1542

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
merged 1 commit into from
Feb 8, 2024
Merged

[CAS] Fix pluginCAS initialization #1542

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3610,8 +3610,8 @@ extension Driver {
// CAS and Caching.
extension Driver {
mutating func getCASPluginPath() throws -> AbsolutePath? {
if let pluginOpt = parsedOptions.getLastArgument(.casPluginOption)?.asSingle {
return try AbsolutePath(validating: pluginOpt.description)
if let pluginPath = parsedOptions.getLastArgument(.casPluginPath)?.asSingle {
return try AbsolutePath(validating: pluginPath.description)
}
return try toolchain.lookupToolchainCASPluginLib()
}
Expand Down
22 changes: 1 addition & 21 deletions Sources/SwiftDriver/Toolchains/Toolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,33 +287,13 @@ extension Toolchain {
#endif
}

/// Looks for the executable in the `SWIFT_DRIVER_TOOLCHAIN_CASPLUGIN_LIB` environment variable, if found nothing,
/// looks in the `lib` relative to the compiler executable.
/// Looks for the executable in the `SWIFT_DRIVER_TOOLCHAIN_CASPLUGIN_LIB` environment variable.
@_spi(Testing) public func lookupToolchainCASPluginLib() throws -> AbsolutePath? {
if let overrideString = env["SWIFT_DRIVER_TOOLCHAIN_CASPLUGIN_LIB"],
let path = try? AbsolutePath(validating: overrideString) {
return path
}
#if os(Windows)
return nil
#else
// Try to look for libToolchainCASPlugin in the developer dir, if found,
// prefer using that. Otherwise, just return nil, and auto fallback to
// builtin CAS.
let libraryName = sharedLibraryName("libToolchainCASPlugin")
let compilerPath = try getToolPath(.swiftCompiler)
let developerPath = compilerPath.parentDirectory // bin
.parentDirectory // toolchain root
.parentDirectory // toolchains
.parentDirectory // developer
let libraryPath = developerPath.appending(component: "usr")
.appending(component: "lib")
.appending(component: libraryName)
if fileSystem.isFile(libraryPath) {
return libraryPath
}
return nil
#endif
}

private func xcrunFind(executable: String) throws -> AbsolutePath {
Expand Down