Skip to content

GraphReport: Add information about compiler arguments #146

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
rockbruno merged 1 commit into from
Jan 14, 2026
Merged

GraphReport: Add information about compiler arguments #146

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
1 change: 1 addition & 0 deletions Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BazelTargetGraphReport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ struct BazelTargetGraphReport: Codable, Equatable {
let minimumOsVersion: String
let cpuArch: String
let sdkName: String
let dependencyBuildArgs: [String]
}

let topLevelTargets: [TopLevelTarget]
Expand Down
21 changes: 15 additions & 6 deletions Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BazelTargetStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,16 +273,25 @@ extension BazelTargetStoreImpl {
platform: topLevelConfig.platform,
minimumOsVersion: topLevelConfig.minimumOsVersion,
cpuArch: topLevelConfig.cpuArch,
sdkName: topLevelConfig.sdkName
sdkName: topLevelConfig.sdkName,
dependencyBuildArgs: PrepareHandler.buildArgs(
minimumOsVersion: topLevelConfig.minimumOsVersion,
platform: topLevelConfig.platform,
cpuArch: topLevelConfig.cpuArch,
devDir: initializedConfig.devDir,
xcodeVersion: initializedConfig.xcodeVersion
)
)
)
}
var reportDependencies: [BazelTargetGraphReport.DependencyTarget] = []
let dependencyTargets = cqueryResult?.buildTargets ?? []
for target in dependencyTargets {
guard let label = target.displayName else { continue }
let configId = try parentConfig(forBSPURI: target.id.uri)
reportDependencies.append(.init(label: label, configId: configId))
if !initializedConfig.baseConfig.compileTopLevel {
let dependencyTargets = cqueryResult?.buildTargets ?? []
for target in dependencyTargets {
guard let label = target.displayName else { continue }
let configId = try parentConfig(forBSPURI: target.id.uri)
reportDependencies.append(.init(label: label, configId: configId))
}
}
return BazelTargetGraphReport(
topLevelTargets: reportTopLevel,
Expand Down
16 changes: 8 additions & 8 deletions Sources/SourceKitBazelBSP/RequestHandlers/PrepareHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ final class PrepareHandler {
// we split the request into multiple Bazel invocations if needed.
var argsToLabelsMap: [[String]: [String]] = [:]
for labelToBuild in platformInfo {
let args = buildArgs(
let args = Self.buildArgs(
minimumOsVersion: labelToBuild.topLevelParentConfig.minimumOsVersion,
platform: labelToBuild.topLevelParentConfig.platform,
cpuArch: labelToBuild.topLevelParentConfig.cpuArch,
Expand Down Expand Up @@ -195,7 +195,7 @@ final class PrepareHandler {
}
}

func buildArgs(
static func buildArgs(
minimumOsVersion: String,
platform: String,
cpuArch: String,
Expand Down Expand Up @@ -227,13 +227,13 @@ final class PrepareHandler {
"--\(friendlyPlatName)_\(cpuFlagName)=\(cpuArch)",
"--apple_platform_type=\(friendlyPlatName)",
"--apple_split_cpu=\(cpuArch)",
"--\(friendlyPlatName)_minimum_os=\"\(minimumOsVersion)\"",
"--\(friendlyPlatName)_minimum_os=\(minimumOsVersion)",
"--cpu=\(platform)_\(cpuArch)",
"--minimum_os_version=\"\(minimumOsVersion)\"",
"--xcode_version=\"\(xcodeVersion)\"",
"--repo_env=DEVELOPER_DIR=\"\(devDir)\"",
"--repo_env=USE_CLANG_CL=\"\(xcodeVersion)\"",
"--repo_env=XCODE_VERSION=\"\(xcodeVersion)\"",
"--minimum_os_version=\(minimumOsVersion)",
"--xcode_version=\(xcodeVersion)",
"--repo_env=DEVELOPER_DIR=\(devDir)",
"--repo_env=USE_CLANG_CL=\(xcodeVersion)",
"--repo_env=XCODE_VERSION=\(xcodeVersion)",
]
}

Expand Down
75 changes: 35 additions & 40 deletions Tests/SourceKitBazelBSPTests/PrepareHandlerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ struct PrepareHandlerTests {
}

func providesCorrectFlagsForiOSTargets() {
let handler = Self.makeHandler().0
let actualFlags = handler.buildArgs(
let actualFlags = PrepareHandler.buildArgs(
minimumOsVersion: "15.0",
platform: "ios",
cpuArch: "arm64",
Expand All @@ -147,20 +146,19 @@ struct PrepareHandlerTests {
"--ios_multi_cpus=arm64",
"--apple_platform_type=ios",
"--apple_split_cpu=arm64",
"--ios_minimum_os=\"15.0\"",
"--ios_minimum_os=15.0",
"--cpu=ios_arm64",
"--minimum_os_version=\"15.0\"",
"--xcode_version=\"17B100\"",
"--repo_env=DEVELOPER_DIR=\"/Applications/Xcode.app/Contents/Developer\"",
"--repo_env=USE_CLANG_CL=\"17B100\"",
"--repo_env=XCODE_VERSION=\"17B100\"",
"--minimum_os_version=15.0",
"--xcode_version=17B100",
"--repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer",
"--repo_env=USE_CLANG_CL=17B100",
"--repo_env=XCODE_VERSION=17B100",
]
)
}

func providesCorrectFlagsForWatchOSTargets() {
let handler = Self.makeHandler().0
let actualFlags = handler.buildArgs(
let actualFlags = PrepareHandler.buildArgs(
minimumOsVersion: "15.0",
platform: "watchos",
cpuArch: "x86_64",
Expand All @@ -173,20 +171,19 @@ struct PrepareHandlerTests {
"--watchos_cpus=x86_64",
"--apple_platform_type=watchos",
"--apple_split_cpu=x86_64",
"--watchos_minimum_os=\"15.0\"",
"--watchos_minimum_os=15.0",
"--cpu=watchos_x86_64",
"--minimum_os_version=\"15.0\"",
"--xcode_version=\"17B100\"",
"--repo_env=DEVELOPER_DIR=\"/Applications/Xcode.app/Contents/Developer\"",
"--repo_env=USE_CLANG_CL=\"17B100\"",
"--repo_env=XCODE_VERSION=\"17B100\"",
"--minimum_os_version=15.0",
"--xcode_version=17B100",
"--repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer",
"--repo_env=USE_CLANG_CL=17B100",
"--repo_env=XCODE_VERSION=17B100",
]
)
}

func providesCorrectFlagsForMacOSTargets() {
let handler = Self.makeHandler().0
let actualFlags = handler.buildArgs(
let actualFlags = PrepareHandler.buildArgs(
minimumOsVersion: "15.0",
platform: "darwin",
cpuArch: "arm64",
Expand All @@ -199,20 +196,19 @@ struct PrepareHandlerTests {
"--macos_cpus=arm64",
"--apple_platform_type=macos",
"--apple_split_cpu=arm64",
"--macos_minimum_os=\"15.0\"",
"--macos_minimum_os=15.0",
"--cpu=darwin_arm64",
"--minimum_os_version=\"15.0\"",
"--xcode_version=\"17B100\"",
"--repo_env=DEVELOPER_DIR=\"/Applications/Xcode.app/Contents/Developer\"",
"--repo_env=USE_CLANG_CL=\"17B100\"",
"--repo_env=XCODE_VERSION=\"17B100\"",
"--minimum_os_version=15.0",
"--xcode_version=17B100",
"--repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer",
"--repo_env=USE_CLANG_CL=17B100",
"--repo_env=XCODE_VERSION=17B100",
]
)
}

func providesCorrectFlagsForTVOSTargets() {
let handler = Self.makeHandler().0
let actualFlags = handler.buildArgs(
let actualFlags = PrepareHandler.buildArgs(
minimumOsVersion: "15.0",
platform: "tvos",
cpuArch: "sim_arm64",
Expand All @@ -225,20 +221,19 @@ struct PrepareHandlerTests {
"--tvos_cpus=sim_arm64",
"--apple_platform_type=tvos",
"--apple_split_cpu=sim_arm64",
"--tvos_minimum_os=\"15.0\"",
"--tvos_minimum_os=15.0",
"--cpu=tvos_sim_arm64",
"--minimum_os_version=\"15.0\"",
"--xcode_version=\"17B100\"",
"--repo_env=DEVELOPER_DIR=\"/Applications/Xcode.app/Contents/Developer\"",
"--repo_env=USE_CLANG_CL=\"17B100\"",
"--repo_env=XCODE_VERSION=\"17B100\"",
"--minimum_os_version=15.0",
"--xcode_version=17B100",
"--repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer",
"--repo_env=USE_CLANG_CL=17B100",
"--repo_env=XCODE_VERSION=17B100",
]
)
}

func providesCorrectFlagsForVisionOSTargets() {
let handler = Self.makeHandler().0
let actualFlags = handler.buildArgs(
let actualFlags = PrepareHandler.buildArgs(
minimumOsVersion: "15.0",
platform: "visionos",
cpuArch: "sim_arm64",
Expand All @@ -251,13 +246,13 @@ struct PrepareHandlerTests {
"--visionos_cpus=sim_arm64",
"--apple_platform_type=visionos",
"--apple_split_cpu=sim_arm64",
"--visionos_minimum_os=\"15.0\"",
"--visionos_minimum_os=15.0",
"--cpu=visionos_sim_arm64",
"--minimum_os_version=\"15.0\"",
"--xcode_version=\"17B100\"",
"--repo_env=DEVELOPER_DIR=\"/Applications/Xcode.app/Contents/Developer\"",
"--repo_env=USE_CLANG_CL=\"17B100\"",
"--repo_env=XCODE_VERSION=\"17B100\"",
"--minimum_os_version=15.0",
"--xcode_version=17B100",
"--repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer",
"--repo_env=USE_CLANG_CL=17B100",
"--repo_env=XCODE_VERSION=17B100",
]
)
}
Expand Down