aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg_Dependencies.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-04-11 18:15:52 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-04-11 18:24:08 -0700
commit7326b6c64dc6b04b6d8512f13dddf67bf7498bf1 (patch)
treee6c095b1c26d0689730efe5f274bbeeb1090e57f /toolsrc/src/vcpkg_Dependencies.cpp
parent0bc21296c9ef32412237a8cc0c8141d0226b9070 (diff)
parent92c0a91d3fdd9a9df5d3feae611981ea170703f5 (diff)
downloadvcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.tar.gz
vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.zip
Merge from master
Diffstat (limited to 'toolsrc/src/vcpkg_Dependencies.cpp')
-rw-r--r--toolsrc/src/vcpkg_Dependencies.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index 024daecfd..3e3f502b5 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -69,7 +69,7 @@ namespace vcpkg::Dependencies
{
for (const std::string& dep_as_string : dependencies_as_string)
{
- const PackageSpec current_dep = PackageSpec::from_name_and_triplet(dep_as_string, spec.target_triplet()).value_or_exit(VCPKG_LINE_INFO);
+ const PackageSpec current_dep = PackageSpec::from_name_and_triplet(dep_as_string, spec.triplet()).value_or_exit(VCPKG_LINE_INFO);
auto it = status_db.find_installed(current_dep);
if (it != status_db.end())
{
@@ -103,7 +103,7 @@ namespace vcpkg::Dependencies
Expected<SourceParagraph> maybe_spgh = Paragraphs::try_load_port(paths.get_filesystem(), paths.port_dir(spec));
if (auto spgh = maybe_spgh.get())
{
- process_dependencies(filter_dependencies(spgh->depends, spec.target_triplet()));
+ process_dependencies(filter_dependencies(spgh->depends, spec.triplet()));
was_examined.emplace(spec, InstallPlanAction{ InstallPlanType::BUILD_AND_INSTALL, request_type, nullopt, std::move(*spgh) });
}
else
@@ -152,7 +152,7 @@ namespace vcpkg::Dependencies
{
if (an_installed_package->want != Want::INSTALL)
continue;
- if (an_installed_package->package.spec.target_triplet() != spec.target_triplet())
+ if (an_installed_package->package.spec.triplet() != spec.triplet())
continue;
const std::vector<std::string>& deps = an_installed_package->package.depends;