diff --git a/Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift b/Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift index 1adfbd827..0c565fd8d 100644 --- a/Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift +++ b/Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift @@ -64,14 +64,16 @@ extension Driver { fileSystem: FileSystem, executor: DriverExecutor) throws -> Set { - do { - if let supportedArgs = - try querySupportedCompilerArgsInProcess(of: toolchain, fileSystem: fileSystem) { - return supportedArgs - } - } catch { - diagnosticsEngine.emit(.remark_inprocess_supported_features_query_failed(error.localizedDescription)) - } + // Disable in-process supported features query due to a race condition in the compiler's current + // build system where libSwiftScan may not be ready when building the Swift standard library. +// do { +// if let supportedArgs = +// try querySupportedCompilerArgsInProcess(of: toolchain, fileSystem: fileSystem) { +// return supportedArgs +// } +// } catch { +// diagnosticsEngine.emit(.remark_inprocess_supported_features_query_failed(error.localizedDescription)) +// } // Fallback: Invoke `swift-frontend -emit-supported-features` and decode the output let frontendOverride = try FrontendOverride(&parsedOptions, diagnosticsEngine) diff --git a/Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift b/Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift index 7e1129150..900d28710 100644 --- a/Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift +++ b/Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift @@ -248,16 +248,18 @@ extension Driver { using: executor.resolver) Self.sanitizeCommandForLibScanInvocation(&command) - do { - if let targetInfo = - try Self.queryTargetInfoInProcess(of: toolchain, fileSystem: fileSystem, - workingDirectory: workingDirectory, - invocationCommand: command) { - return targetInfo - } - } catch { - diagnosticsEngine.emit(.remark_inprocess_target_info_query_failed(error.localizedDescription)) - } + // Disable in-process target query due to a race condition in the compiler's current + // build system where libSwiftScan may not be ready when building the Swift standard library. +// do { +// if let targetInfo = +// try Self.queryTargetInfoInProcess(of: toolchain, fileSystem: fileSystem, +// workingDirectory: workingDirectory, +// invocationCommand: command) { +// return targetInfo +// } +// } catch { +// diagnosticsEngine.emit(.remark_inprocess_target_info_query_failed(error.localizedDescription)) +// } // Fallback: Invoke `swift-frontend -print-target-info` and decode the output return try executor.execute(