Skip to content

Commit fc4a83a

Browse files
authored
Merge pull request #910 from artemcm/EmitSupportedFeaturesLib
Query compiler supported features from `libSwiftScan`, when one is present
2 parents b010b92 + 40da897 commit fc4a83a

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@ extension Driver {
5959
fileSystem: FileSystem,
6060
executor: DriverExecutor, env: [String: String])
6161
throws -> Set<String> {
62-
// TODO: Once we are sure libSwiftScan is deployed across supported platforms and architectures
63-
// we should deploy it here.
64-
// let swiftScanLibPath = try Self.getScanLibPath(of: toolchain,
65-
// hostTriple: hostTriple,
66-
// env: env)
67-
//
68-
// if fileSystem.exists(swiftScanLibPath) {
69-
// let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
70-
// if libSwiftScanInstance.canQuerySupportedArguments() {
71-
// return try libSwiftScanInstance.querySupportedArguments()
72-
// }
73-
// }
62+
// if libSwiftScan is present in the toolchain, query the compiler supported features
63+
// using the SwiftScan interface, instead of calling out to swift-frontend.
64+
let swiftScanLibPath = try Self.getScanLibPath(of: toolchain,
65+
hostTriple: hostTriple,
66+
env: env)
67+
68+
if fileSystem.exists(swiftScanLibPath) {
69+
let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
70+
if libSwiftScanInstance.canQuerySupportedArguments() {
71+
return try libSwiftScanInstance.querySupportedArguments()
72+
}
73+
}
7474

7575
// Invoke `swift-frontend -emit-supported-features`
7676
let frontendOverride = try FrontendOverride(&parsedOptions, diagnosticsEngine)

0 commit comments

Comments
 (0)