[mingw] Use find_file to find compiler, fall back to unprefixed windres if the prefixed version doesn't exist#15179
Merged
vicroms merged 1 commit intomicrosoft:masterfrom Dec 21, 2020
Conversation
…es if the prefixed version doesn't exist
Contributor
|
@vadi2 Can you please test this PR? Thanks. |
Contributor
|
Yes, happy to! |
vadi2
reviewed
Dec 18, 2020
Contributor
vadi2
left a comment
There was a problem hiding this comment.
Unfortunately it fails on installing a dependency first, this is in the Github Actions environment:
[1/18] cmd.exe /C "cd /D D:\a\Mudlet\Mudlet\3rdparty\vcpkg\buildtrees\zlib\x64-mingw-dynamic-dbg && x86_64-w64-mingw32-windres.exe -D GCC_WINDRES -I D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/src/1.2.11-63309e48e5.clean -I D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/x64-mingw-dynamic-dbg -o D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/x64-mingw-dynamic-dbg/zlib1rc.obj -i D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/src/1.2.11-63309e48e5.clean/win32/zlib1.rc"
FAILED: zlib1rc.obj
cmd.exe /C "cd /D D:\a\Mudlet\Mudlet\3rdparty\vcpkg\buildtrees\zlib\x64-mingw-dynamic-dbg && x86_64-w64-mingw32-windres.exe -D GCC_WINDRES -I D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/src/1.2.11-63309e48e5.clean -I D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/x64-mingw-dynamic-dbg -o D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/x64-mingw-dynamic-dbg/zlib1rc.obj -i D:/a/Mudlet/Mudlet/3rdparty/vcpkg/buildtrees/zlib/src/1.2.11-63309e48e5.clean/win32/zlib1.rc"
'x86_64-w64-mingw32-windres.exe' is not recognized as an internal or external command,
operable program or batch file.
ninja: build stopped: subcommand failed.
Contributor
Author
|
It's working fine on my computer, have you pulled my branch? |
Contributor
Author
|
@JackBoosY Remove the port-bug tag please, I pushed to the wrong branch. That commit is now in a different PR #15215 |
aabe77d to
3a810a8
Compare
JackBoosY
suggested changes
Dec 21, 2020
JackBoosY
approved these changes
Dec 21, 2020
Contributor
|
LGTM in my side. |
Member
|
Thanks for the PR! |
ryukw7
pushed a commit
to ryukw7/vcpkg
that referenced
this pull request
Dec 24, 2020
…es if the prefixed version doesn't exist (microsoft#15179)
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.
Describe the pull request
This PR changes the compiler detection mechanism in the mingw toolchain to use
find_file, to detect the absence of prefixed executable, and fall back to the unprefixed version.All mingw triplets
Yes