The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg] Move package abi access after they have been computed

Browse Source
This commit is contained in:
Robert Schumacher 2020-03-18 11:48:33 -07:00
parent 090e7f8e76
commit 44b9703a81
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/src/vcpkg/commands.ci.cpp
View File

@ -296,7 +296,6 @@ namespace vcpkg::Commands::CI
install_specs.emplace_back(FullPackageSpec{
install_action.spec,
std::vector<std::string>{install_action.feature_list.begin(), install_action.feature_list.end()}});
ret->abi_map.emplace(install_action.spec, install_action.package_abi.value_or_exit(VCPKG_LINE_INFO));
}
var_provider.load_tag_vars(install_specs, provider);
@ -315,6 +314,7 @@ namespace vcpkg::Commands::CI
for (auto&& action : action_plan.install_actions)
{
auto p = &action;
ret->abi_map.emplace(action.spec, action.package_abi.value_or_exit(VCPKG_LINE_INFO));
if (auto scfl = p->source_control_file_location.get())
{
auto emp = ret->default_feature_provider.emplace(p->spec.name(), *scfl);