averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-02 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Require a Swift 6 compiler to build SourceKit-LSP"

Browse Source 
This reverts commit 7ab7c01cdc.

# Conflicts:
#	Package.swift
This commit is contained in:
Alex Hoppen
2024-09-26 15:09:28 -07:00
parent c96fff1c7b
commit 2ec571b529
20 changed files with 507 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View File

@@ -448,7 +448,23 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
throw NonFileURIError(uri: file)
}
return try buildTarget.compileArguments(for: fileURL)
let compileArguments = try buildTarget.compileArguments(for: fileURL)
#if compiler(>=6.1)
#warning("When we drop support for Swift 5.10 we no longer need to adjust compiler arguments for the Modules move")
#endif
// Fix up compiler arguments that point to a `/Modules` subdirectory if the Swift version in the toolchain is less
// than 6.0 because it places the modules one level higher up.
let toolchainVersion = await orLog("Getting Swift version") { try await toolchain.swiftVersion }
guard let toolchainVersion, toolchainVersion < SwiftVersion(6, 0) else {
return compileArguments
}
return compileArguments.map { argument in
if argument.hasSuffix("/Modules"), argument.contains(self.swiftPMWorkspace.location.scratchDirectory.pathString) {
return String(argument.dropLast(8))
}
return argument
}
}
package func buildTargets(request: WorkspaceBuildTargetsRequest) async throws -> WorkspaceBuildTargetsResponse {