Fix for wrong compiler executable when using custom toolchains #6419
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
commented
May 6, 2024
Comment on lines
136
to
137
| e -> e.getKey().getCppExecutable(), | ||
| e -> e.getValue().getCompilerVersion())); | ||
| e -> e.getKey().getCppCompiler(), | ||
| e -> e.getValue().getCppCompilerVersion())); |
There was a problem hiding this comment.
This not correct and I already had a simple fix for BlazeCompilerInfoMapService. But maybe it is worth taking a closer look considering #6410. Since this would require more changes I would like to merge this first.
LeFrosch
changed the title
LeFrosch
force-pushed
the
Daniel.Brauner/cpp-toolchains-3
branch
from
76adca9 to
78e49c0
Compare
LeFrosch
requested review from
mai93,
jastice,
tpasternak and
agluszak
as code owners
github-actions
bot
added
product: CLion
ujohnny
requested changes
May 23, 2024
base/src/com/google/idea/blaze/base/ideinfo/CToolchainIdeInfo.java
Outdated
Show resolved
Hide resolved
cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java
Outdated
Show resolved
Hide resolved
cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java
Outdated
Show resolved
Hide resolved
base/src/com/google/idea/blaze/base/ideinfo/CToolchainIdeInfo.java
Outdated
Show resolved
Hide resolved
- Use ACTION_NAMES constants - Fixed getCppCompiler returns cCompiler - Renamed setCompiler to setCCppCompiler - Fixed CToolchainIdeInfo proto order
LeFrosch
force-pushed
the
Daniel.Brauner/cpp-toolchains-3
branch
from
78e49c0 to
a258a19
Compare
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.
Checklist
Please note that the maintainers will not be reviewing this change until all checkboxes are ticked. See
the Contributions section in the README for more
details.
Discussion thread for this change
Issue number: #6418
Description of this change
Fixes #6418 by using
cc_common.get_tool_for_actionto find the right c and cpp compiler executable.