Fix CHPL_LLVM=bundled build when a system LLVM is installed #26402
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]>
mppf
approved these changes
Dec 13, 2024
7 tasks
jabraham17
added a commit
that referenced
this pull request
Jan 6, 2025
…#26428) 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 by `CHPL_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. 1. computes the existing search paths for the compiler 2. for each LLVM include directory specified as `-I` - In a bundled LLVM build: always use '-isystem' - In a system LLVM build: use '-isystem' if its not an existing search path, otherwise use '-I' Testing - [x] `make check` with HOST_CC=clang, LLVM=system - [x] `make check` with HOST_CC=clang, LLVM=bundled - [x] `make check` with HOST_CC=clang, LLVM=system, LLVM_CONFIG=/some/path, with/without a normal system LLVM - [x] `make check` with HOST_CC=gnu, LLVM=system - [x] `make check` with HOST_CC=gnu, LLVM=bundled - [x] `make check` with HOST_CC=gnu, LLVM=system, LLVM_CONFIG=/some/path, with/without a normal system LLVM - [x] Sanity check that normal compilations on Mac are not broken [Reviewed by @mppf]
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 an issue where having a system install of LLVM could prevent compiler builds with CHPL_LLVM=bundled.
This issue occurs when a system install of LLVM is in the normal C system includes, but then we treat our bundled LLVM as a system include. Since we were treating our bundled LLVM as a system include (added at the end of the list), the system LLVM headers were being erroneously used by the compiler.
The solution is to add bundled LLVM headers as system includes, but add them to the front of the list instead of the end.
Related previous PR: #26212
[Reviewed by @mppf]