CLion: Only forward builtin includes from a custom sysroot #7667
Conversation
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
LeFrosch
changed the title
github-actions
bot
added
product: CLion
|
This change requires further investigation, why does Bazel report both include directories? What if toolchain actually does define include paths that are not in the sysroot and cannot be discovered by CLion? |
|
As far as I understand the issue here is caused by a bug in rules_cc. Maybe we should not forward all include paths reported by rules_cc since they have proven to be unreliable and instead relay on CLions compiler info collection. But not sure yet how to filter the include paths reported by rules_cc. |
ujohnny
reviewed
Jun 27, 2025
| // includes can lead to headers being resolved into the wrong include directory. | ||
| final var sysroot = compilerSettings.getSysroot(); | ||
| if (sysroot != null) { | ||
| compilerSettings.getBuiltInIncludes().stream() |
There was a problem hiding this comment.
let's revise this PR and consider doing this with registry key. I'm unsure if this change as is would lead to some unresolved headers etc, this has to be validated with custom toolchain with sysroot.
# Conflicts: # clwb/BUILD
…tests # Conflicts: # cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
ujohnny
requested changes
Jul 11, 2025
ujohnny
approved these changes
Jul 11, 2025
github-project-automation
bot
moved this from Untriaged
to Done
in Bazel IntelliJ Plugin
github-actions
bot
removed
the
awaiting-review
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.
Discussion thread for this change
Issue number: #7489
Description of this change
Builtin includes reported by the CcToolchainInfo provider sometimes contain include paths for both libc++ and libstdc++ regardless of what compiler options are specified. CLion is able to find the right include path during compiler info collection automatically. But if both include paths are manually added to the switch builder CLion might select the wrong one after all.
Therefore, only forward builtin includes which point into a custom sysroot and let CLion detect the correct builtin includes during compiler info collection.