Detect OpenMP on macOS with Apple's Clang (rebased on master)#13350
Merged
eli-schwartz merged 7 commits intomesonbuild:masterfrom Jun 26, 2024
Merged
Detect OpenMP on macOS with Apple's Clang (rebased on master)#13350eli-schwartz merged 7 commits intomesonbuild:masterfrom
master)#13350eli-schwartz merged 7 commits intomesonbuild:masterfrom
Conversation
Member
Member
This will be needed by the Apple compiler
In case the OpenMP definition adds things like preprocessor directives or include paths, like when building on MacOS with OpenMP from Homebrew.
It was probably done this way originally since we didn't have the `fatal` keyword argument to avoid triggering the fatal-meson-warnings. While we're here, replace the use of a `if bool` with an `else` on the for loop.
And into the Clang-CL mixin.
Which requires injecting some extra paths and the `-Xpreprocess` flag, as well as extra search paths for libomp and the headers. Fixes: mesonbuild#7435
Instead of making the variable optional, just return if we hit the error case, since that's all that's going to happen anyway
18ff903 to
5f7c221
Compare
Contributor
Author
|
OK thanks a lot for your feed-back, I used rebase this time and force pushed.
@dcbaker no worries, I completely understand and thanks a lot for you work on this! |
Member
|
Since this is a fairly hefty change, it will only be considered for 1.5 if there is an rc2. |
main merged)master)
Member
|
I think we are going to want an rc2 anyway. Changes look good to me. In it goes. |
Contributor
Author
|
Great to see this merged, thanks a lot everyone 🙏! |
This was referenced Jul 22, 2024
2 tasks
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
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.
Supersedes and closes #13079. I followed @tristan957's advice in #13079 (comment).