From 44b9703a810c38256bb1e221385a63faf59255bb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 18 Mar 2020 11:48:33 -0700 Subject: [vcpkg] Move package abi access after they have been computed --- toolsrc/src/vcpkg/commands.ci.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index b5ab9e79d..7b65eac99 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -296,7 +296,6 @@ namespace vcpkg::Commands::CI install_specs.emplace_back(FullPackageSpec{ install_action.spec, std::vector{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); -- cgit v1.2.3