Fix compilation with MinGW only #2053
Merged
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
|
I tested this and can confirm, that this fix does not break compiling using msys2. So its all fine from my side. |
Baljak
force-pushed
the
mingw-compilation
branch
from
c273000 to
401137c
Compare
|
Thanks for the review @kanonet. I simplified the check as you suggested. |
|
Great, thanks everyone! |
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.
PR #1851 broke compilation with MinGW without MSYS. See #1851 (comment).
This fixes it while still retaining the intent of the original PR. Since both MSYS and MYS2 define a MSYSTEM environment variable, we just need to check if it is defined or not.