[clangd] Forward --target to system include extraction #65824
Merged
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
HighCommander4
requested changes
Sep 10, 2023
There was a problem hiding this comment.
Thanks for the patch!
There is some prior work on this which I've looked over and will summarize:
- This change was previously proposed in D138546
- During its review, we discovered that clangd would run a processing step on the compile command that sometimes adds a
-targetflag, inferred from the compiler name, to the command, before runningSystemIncludeExtractor, and propagating-targetto the extraction command then caused an error if the compiler was a gcc (since gcc does not support-target).- The patch was updated to fix this (by moving that processing step to happen after
SystemIncludeExtractor). That change was since independently made and merged in D143436.
- The patch was updated to fix this (by moving that processing step to happen after
- We also discovered that
SystemIncludeExtractorwas failing to include arguments like--sysrootin the key under which it caches its results (and adding-targetwould have compounded that problem).- That has since been fixed in D146941.
Activity on D138546 has since stalled, but the next step would have been to rebase it on top of D143436 and D146941... which is basically what this patch does!
So, I think this patch should be good to go (modulo a small bug I commented on inline).
Some clang multilib configurations (such as the one currently used in the beta ARM LLVM toolchain) wind up only reporting the C++ include paths properly if they get passed the correct target.
mincrmatt12
force-pushed
the
forward-clangd-target
branch
from
dac47fe to
e5f74b0
Compare
|
Thanks so much for carrying this forward, Nathan. |
HighCommander4
approved these changes
Sep 11, 2023
|
🎉 |
ZijunZhaoCCK
pushed a commit
to ZijunZhaoCCK/llvm-project
that referenced
this pull request
Sep 19, 2023
Some clang multilib configurations (such as the one currently used in the [beta ARM LLVM toolchain](https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm)) wind up only reporting the C++ include paths properly if they get passed the correct target. This patch ensures the `--target` (or `-target`) arguments are correctly sent to the queried driver.
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.
Some clang multilib configurations (such as the one currently used in the beta ARM LLVM toolchain) wind up only reporting the C++ include paths properly if they get passed the correct target. This patch ensures the
--target(or-target) arguments are correctly sent to the queried driver.