Fix issues with using a non-default system LLVM with CHPL_LLVM_CONFIG #26428
Conversation
This file contains 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
Signed-off-by: Jade Abraham <[email protected]>
Signed-off-by: Jade Abraham <[email protected]>
Signed-off-by: Jade Abraham <[email protected]>
jabraham17
changed the title
mppf
approved these changes
Dec 19, 2024
| @@ -1024,6 +1024,42 @@ def get_clang_prgenv_args(): | |||
|
|
|||
| return (comp_args, link_args) | |||
|
|
|||
| @memoize | |||
| def get_system_include_directories(flag, lang): | |||
There was a problem hiding this comment.
I'm pretty sure this code will only work for gcc and clang. I'd recommend limiting it to those compilers. We can add other compilers as needed.
| ret.append('-isystem' + directory) | ||
| else: | ||
| # technically don't need to add this for | ||
| # but it's harmless to use -I |
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.
Fixes compiler build issues when using a system LLVM that is different than the standard LLVM. For example, an LLVM installed at
/usr/would conflict with an LLVM installed at/home/user/llvm-install(which was accessed byCHPL_LLVM_CONFIG=/home/user/llvm-install)Subsumes #26212 and #26402
Previous work had tried to take advantage of various clang/gcc flags to achieve the right behavior, however this not working in all cases. This PR does following.
-ITesting
make checkwith HOST_CC=clang, LLVM=systemmake checkwith HOST_CC=clang, LLVM=bundledmake checkwith HOST_CC=clang, LLVM=system, LLVM_CONFIG=/some/path, with/without a normal system LLVMmake checkwith HOST_CC=gnu, LLVM=systemmake checkwith HOST_CC=gnu, LLVM=bundledmake checkwith HOST_CC=gnu, LLVM=system, LLVM_CONFIG=/some/path, with/without a normal system LLVM