-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[vcpkg] Environment Variable Passthrough #7290
Conversation
toolsrc/src/vcpkg/build.cpp
Outdated
if (feature == "core") | ||
return Util::fmap_flatten(feature_list, | ||
[&](std::string const& feature) -> std::vector<Features> { | ||
if (feature == "core") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nitpick: Indentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I noticed that in the next PR.
toolsrc/src/vcpkg/build.cpp
Outdated
const std::string& abi_tag, | ||
const BuildPackageConfig& config) | ||
static std::vector<System::CMakeVariable> get_cmake_vars(const VcpkgPaths& paths, | ||
const PreBuildInfo& pre_build_info, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pre_build_info
is not used in the function
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah true, but it will be 😄, I'll get rid of it for this PR.
No I don't think it's necessary, the two can live together. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I spent more time sorting through all the unrelated cleanup than reviewing the actual passthrough change. We should get this checked in so it cleans up your other related PRs :)
* use additional env param * remove partials * remove change to linux triplet * Fix some issues that vicroms pointed out * whitespace change
Currently on Windows the only environment variables available to the portfile are those found on a whitelist hard-coded into vcpkg. This change allows us to set the variables passed through as a Cmake list in the triplet.
A change should be made to vcpkg to sanitize the linux environment.