SCons: Fix get_mingw_tool regression
#91734
Closed
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
Repiteo
force-pushed
the
scons/get_mingw_tool-fixes
branch
from
676b764 to
020c018
Compare
Repiteo
force-pushed
the
scons/get_mingw_tool-fixes
branch
from
020c018 to
9ef4470
Compare
akien-mga
approved these changes
May 9, 2024
|
Seems this doesn't fix #91710 |
|
Oh wow, so you're experiencing a different issue than what I was able to replicate; it must be very specific to |
Try running it with I was thinking it's the issue with MSYS2 paths, but now I am not sure since there's |
|
Strange, seems like output is the same, I was expecting it to print full commands. Maybe it only works if it's added before |
|
Ah, right. So: |
bruvzg
reviewed
May 9, 2024
There was a problem hiding this comment.
The only differences from the logic before #85319 I see, it was not using try_cmd for windres and was doing if len(out[1]): on the windres output and retrying without prefix, this is probably intentional, but I do not remember why.
So it's possible that there are multiple copiers of windres and only some of them work, support different set or architectures for example (but all might run with --version only).
Or it's possible that some version of windres does not respond to --version or return non-zero exit code.
I would probably consider reverting #85319, there's no benefit to this change beside code readability, and with newly added unclear env checks and addition of the prefix to PATH, I think it's now less readable that it was before #85319.
|
I agree, let's revert to the previous state for now, and maybe reconsider in a new PR how to improve this code's readability and maintainability without regressions. Superseded by #91751. |
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.
Closes #91710
get_mingw_toolwas refactored to take SConsEnvironment as an optional argument. It only looks for a prefixed executable when checking if Windows is a supported platform, ensuring no false positives. If Windows is supported & selected for building, themingw_prefixbin folder is prepended to the SCons Environment's path.