Merge branch 'master' of https://github.com/Microsoft/vcpkg

1 files changed, 6 insertions, 6 deletions

diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index a47083cbd..5ad39ae63 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -28,12 +28,12 @@ namespace vcpkg::Commands::Build
 
     BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db)
     {
-        Checks::check_exit(spec.name() == source_paragraph.name, "inconsistent arguments to build_package()");
+        Checks::check_exit(VCPKG_LINE_INFO, spec.name() == source_paragraph.name, "inconsistent arguments to build_package()");
 
         const triplet& target_triplet = spec.target_triplet();
-        for (auto&& dep : source_paragraph.depends)
+        for (auto&& dep : filter_dependencies(source_paragraph.depends, target_triplet))
         {
-            if (status_db.find_installed(dep.name, target_triplet) == status_db.end())
+            if (status_db.find_installed(dep, target_triplet) == status_db.end())
             {
                 return BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES;
             }
@@ -101,7 +101,7 @@ namespace vcpkg::Commands::Build
             case BuildResult::BUILD_FAILED: return BUILD_FAILED_STRING;
             case BuildResult::POST_BUILD_CHECKS_FAILED: return POST_BUILD_CHECKS_FAILED_STRING;
             case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: return CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING;
-            default: Checks::unreachable();
+            default: Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
@@ -134,7 +134,7 @@ namespace vcpkg::Commands::Build
         }
 
         const expected<SourceParagraph> maybe_spgh = Paragraphs::try_load_port(port_dir);
-        Checks::check_exit(!maybe_spgh.error_code(), "Could not find package named %s: %s", spec, maybe_spgh.error_code().message());
+        Checks::check_exit(VCPKG_LINE_INFO, !maybe_spgh.error_code(), "Could not find package named %s: %s", spec, maybe_spgh.error_code().message());
         const SourceParagraph& spgh = *maybe_spgh.get();
 
         StatusParagraphs status_db = database_load_check(paths);
@@ -149,7 +149,7 @@ namespace vcpkg::Commands::Build
                                }),
                 unmet_dependencies.end());
 
-            Checks::check_exit(!unmet_dependencies.empty());
+            Checks::check_exit(VCPKG_LINE_INFO, !unmet_dependencies.empty());
             System::println(System::color::error, "The build command requires all dependencies to be already installed.");
             System::println("The following dependencies are missing:");
             System::println("");