Repository navigation
Derive toolchain include paths from repo labels, not hardcoded external/ strings - #22
Merged
Merged
Conversation
…al/ strings
cc_linux_gnu_config formatted -isystem paths as "external/{gcc_repo}/{path}"
using plain string attrs. This only works because Bazel's WORKSPACE mode
happens to name external repo directories after their apparent name; under
bzlmod, module-extension-generated repos get canonical names (e.g. with a
"+" separator) that don't match, breaking formatted include paths.
Switch gcc_repo/linux-libc references to label attrs (sysroot, libc_headers)
and derive the on-disk path from label.workspace_root, which Bazel keeps
correct regardless of repo naming scheme or layout. This is compatible
with WORKSPACE and MODULE.bazel.
aredman-agtonomy
marked this pull request as ready for review
September 9, 2026 16:03
gartnera
reviewed
Sep 9, 2026
Member
There was a problem hiding this comment.
can we add a ci/test for bazel 8/9?
gartnera
approved these changes
Sep 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cc_linux_gnu_config formatted -isystem paths as "external/{gcc_repo}/{path}"
using plain string attrs. This only works because Bazel's WORKSPACE mode
happens to name external repo directories after their apparent name; under
bzlmod, module-extension-generated repos get canonical names (e.g. with a
"+" separator) that don't match, breaking formatted include paths.
Switch gcc_repo/linux-libc references to label attrs (sysroot, libc_headers)
and derive the on-disk path from label.workspace_root, which Bazel keeps
correct regardless of repo naming scheme or layout. This is compatible
with WORKSPACE and MODULE.bazel.
Tested x86_64 and cross compile on haystack, both succeed.