release/21.x: [OpenMP] Fix preprocessor mismatches between include and usages of hwloc (#158349) #163768
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
Member
Author
|
@mjklemm What do you think about merging this PR to the release branch? |
Contributor
|
@pearzt Does this fix a critical error so that a backport is warranted? |
Contributor
|
@mjklemm I wouldn't call it critical, but it fixes a build error on Darwin without touching any functionality. Without a backport, all upcoming v21.x releases would be affected. If this doesn't qualify it for a backport, I'm fine with closing this. |
…loc (llvm#158349) Fix llvm#156679 There is a mismatch between the preprocessor guards around the include of `hwloc.h` and those protecting its usages, leading to build failures on Darwin: spack/spack-packages#1212 This change introduces `KMP_HWLOC_ENABLED` that reflects whether hwloc is actually used. (cherry picked from commit cd24d10)
github-project-automation
bot
moved this from Needs Review
to Done
in LLVM Release Status
|
@pearzt (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Backport cd24d10
Requested by: @pearzt