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 build] fix #12355 (#12367)

Browse Source
This commit is contained in:
nicole mazzuca 2020-07-10 16:06:01 -07:00 committed by GitHub
parent 8a8d725b43
commit 544f8e4593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolsrc/src/vcpkg/build.cpp
View File

@ -88,13 +88,14 @@ namespace vcpkg::Build
auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths); auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths);
auto& var_provider = *var_provider_storage; auto& var_provider = *var_provider_storage;
var_provider.load_dep_info_vars(std::array<PackageSpec, 1>{full_spec.package_spec}); var_provider.load_dep_info_vars(std::array<PackageSpec, 1>{full_spec.package_spec});
var_provider.load_tag_vars(std::array<FullPackageSpec, 1>{full_spec}, provider);
StatusParagraphs status_db = database_load_check(paths); StatusParagraphs status_db = database_load_check(paths);
auto action_plan = Dependencies::create_feature_install_plan( auto action_plan = Dependencies::create_feature_install_plan(
provider, var_provider, std::vector<FullPackageSpec>{full_spec}, status_db); provider, var_provider, std::vector<FullPackageSpec>{full_spec}, status_db);
var_provider.load_tag_vars(action_plan, provider);
const PackageSpec& spec = full_spec.package_spec; const PackageSpec& spec = full_spec.package_spec;
const SourceControlFile& scf = *scfl.source_control_file; const SourceControlFile& scf = *scfl.source_control_file;
@ -913,7 +914,7 @@ namespace vcpkg::Build
} }
} }
action.abi_info = Build::AbiInfo(); action.abi_info = AbiInfo();
auto& abi_info = action.abi_info.value_or_exit(VCPKG_LINE_INFO); auto& abi_info = action.abi_info.value_or_exit(VCPKG_LINE_INFO);
abi_info.pre_build_info = std::make_unique<PreBuildInfo>( abi_info.pre_build_info = std::make_unique<PreBuildInfo>(