[vcpkg] Fix vcpkg crash and fail to apply patch issue when set VCPKG_FORCE_SYSTEM_BINARIES=1 #181
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
BillyONeal
requested changes
Sep 3, 2021
| } | ||
| else | ||
| { | ||
| return get_path(paths, CMakeProvider()); |
There was a problem hiding this comment.
This is probably wrong; you need CMakeProvider to be ToolProvider where Tool is one of Git, or Ninja, or w/e
Be-ing
reviewed
Oct 18, 2021
Comment on lines
-590
to
+608
| if (get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value()) | ||
| { | ||
| return {"cmake", "0"}; | ||
| } | ||
| return get_path(paths, CMakeProvider()); | ||
| get_system_tool_path(paths, "cmake"); |
There was a problem hiding this comment.
This looks like it would cause a lot of binary cache key misses because the CMake version is included in the vcpkg_abi_info.txt. See also: microsoft/vcpkg#16615
There was a problem hiding this comment.
Sorry I think I got confused by the name of the new get_system_tool_path function introduced in this PR. From the name of the function I expected it to unconditionally use the system version of the tool rather than a copy vcpkg downloads. But it is a wrapper around get_path.
|
This PR has been effectively merged as part of #540 |
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.
Fixes microsoft/vcpkg#16216
See microsoft/vcpkg#16216 (comment)