Avoid conflict between mingw-std-threads and Clang's own #85208
Merged
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
akien-mga
approved these changes
Nov 22, 2023
|
I think I've messed up the condition. Will force-push in a minute. |
RandomShaper
force-pushed
the
fix_mingw_clang
branch
from
cb0579b
to
68fa1da
Compare
|
The new condition makes sense to me, but the patch file seems out of sync. |
RandomShaper
force-pushed
the
fix_mingw_clang
branch
2 times, most recently
from
99bd090
to
6aea7e1
Compare
|
Please let me know how it looks now. I can't trust my eyes today anymore. |
|
Tested with llvm-mingw Clang on Windows and seems to now build and run after some quick test, fixes the build errors I mentioned on RocketChat. One extra change is needed to fix building with int errnum = errno; |
RandomShaper
force-pushed
the
fix_mingw_clang
branch
from
6aea7e1
to
205066a
Compare
|
@bitsawer Thanks lots for testing! Suggestion applied. |
|
Thanks! |
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.
Since mingw-std-threads would inject its symbols into
stdif it thinks there's no other implementation around while using a MinGW compiler (#if (__cplusplus < 201703L) || (defined(__MINGW32__ ) && !defined(_GLIBCXX_HAS_GTHREADS)), it will break LLVM-MinGW builds. The reason is that LLVM-MinGW provides implementations but doesn't define_GLIBCXX_HAS_GTHREADS.This PR rewrites the patch to change the check to
#if defined(__MINGW32__ ) && !(defined(_GLIBCXX_HAS_GTHREADS) && !defined(__clang__))#if defined(__MINGW32__ ) && !defined(_GLIBCXX_HAS_GTHREADS) && !defined(__clang__)).Another option would have been just not to use mingw-std-threads at all on LLVM-MinGW, but I see value in using the same implemention in both MinGW-style compilers. Other opinions welcome.