averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[xcodegen] Avoid tracking inferArgs per target/source

Browse Source 
This is unnecessary since we never configure it
per target, just check the global setting.
This commit is contained in:
Hamish Knight
2025-01-01 13:34:48 +00:00
parent 38c1d28197
commit ddfe63bdc8
4 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/swift-xcodegen/Sources/SwiftXcodeGen/Generator/ProjectGenerator.swift
View File

@@ -34,7 +34,7 @@ fileprivate final class ProjectGenerator {
private var groups: [RelativePath: CachedGroup] = [:]
private var files: [RelativePath: Xcode.FileReference] = [:]
private var targets: [String: Xcode.Target] = [:]
private var unbuildableSources: [ClangTarget.Source] = []
private var unbuildableSources: [RelativePath] = []
private var runnableBuildTargets: [RunnableTarget: Xcode.Target] = [:]
/// The group in which external files are stored.
@@ -321,12 +321,11 @@ fileprivate final class ProjectGenerator {
return false
}
let parent = clangTarget.parentPath
let sources = clangTarget.sources.map(\.path)
let hasConsistentArgs = try sources.allSatisfy {
let hasConsistentArgs = try clangTarget.sources.allSatisfy {
try !buildDir.clangArgs.hasUniqueArgs(for: $0, parent: parent)
}
guard hasConsistentArgs else { return false }
return try canUseBuildableFolder(at: parent, sources: sources)
return try canUseBuildableFolder(at: parent, sources: clangTarget.sources)
}
func canUseBuildableFolder(
@@ -394,15 +393,14 @@ fileprivate final class ProjectGenerator {
let sourcesToBuild = target.addSourcesBuildPhase()
for source in targetInfo.sources {
let sourcePath = source.path
guard let sourceRef = getOrCreateRepoRef(.file(sourcePath)) else {
guard let sourceRef = getOrCreateRepoRef(.file(source)) else {
continue
}
let buildFile = sourcesToBuild.addBuildFile(fileRef: sourceRef)
// Add any per-file settings.
var fileArgs = try buildDir.clangArgs.getUniqueArgs(
for: sourcePath, parent: targetPath, infer: source.inferArgs
for: source, parent: targetPath, infer: spec.inferArgs
)
if !fileArgs.isEmpty {
applyBaseSubstitutions(to: &fileArgs)