Merge remote-tracking branch 'origin' into create_install_tests

3 files changed, 10 insertions, 10 deletions

diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index 82d50a68f..8e11ae5b1 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -775,15 +775,15 @@ namespace vcpkg::PostBuildLint
             error_count += check_lib_architecture(pre_build_info.target_architecture, libs);
         }
 
+        std::vector<fs::path> debug_dlls = fs.get_files_recursive(debug_bin_dir);
+        Util::unstable_keep_if(debug_dlls, has_extension_pred(fs, ".dll"));
+        std::vector<fs::path> release_dlls = fs.get_files_recursive(release_bin_dir);
+        Util::unstable_keep_if(release_dlls, has_extension_pred(fs, ".dll"));
+
         switch (build_info.library_linkage)
         {
             case Build::LinkageType::DYNAMIC:
             {
-                std::vector<fs::path> debug_dlls = fs.get_files_recursive(debug_bin_dir);
-                Util::unstable_keep_if(debug_dlls, has_extension_pred(fs, ".dll"));
-                std::vector<fs::path> release_dlls = fs.get_files_recursive(release_bin_dir);
-                Util::unstable_keep_if(release_dlls, has_extension_pred(fs, ".dll"));
-
                 error_count += check_matching_debug_and_release_binaries(debug_dlls, release_dlls);
 
                 error_count += check_lib_files_are_available_if_dlls_are_available(
@@ -804,8 +804,8 @@ namespace vcpkg::PostBuildLint
             }
             case Build::LinkageType::STATIC:
             {
-                std::vector<fs::path> dlls = fs.get_files_recursive(package_dir);
-                Util::unstable_keep_if(dlls, has_extension_pred(fs, ".dll"));
+                auto dlls = release_dlls;
+                dlls.insert(dlls.end(), debug_dlls.begin(), debug_dlls.end());
                 error_count += check_no_dlls_present(dlls);
 
                 error_count += check_bin_folders_are_not_present_in_static_build(fs, package_dir);
diff --git a/toolsrc/src/commands_help.cpp b/toolsrc/src/commands_help.cpp
index a9f9956fe..e4be11a77 100644
--- a/toolsrc/src/commands_help.cpp
+++ b/toolsrc/src/commands_help.cpp
@@ -56,7 +56,7 @@ namespace vcpkg::Commands::Help
     std::string create_example_string(const std::string& command_and_arguments)
     {
         std::string cs = Strings::format("Example:\n"
-                                         "  vcpkg %s",
+                                         "  vcpkg %s\n",
                                          command_and_arguments);
         return cs;
     }
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index c91c6be78..883fe6612 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -94,7 +94,7 @@ namespace vcpkg::System
         };
 
         // Flush stdout before launching external process
-        _flushall();
+        fflush(nullptr); 
 
         std::vector<const wchar_t*> env_cstr;
         env_cstr.reserve(env_wstrings.size() + 2);
@@ -125,7 +125,7 @@ namespace vcpkg::System
     int cmd_execute(const CWStringView cmd_line)
     {
         // Flush stdout before launching external process
-        _flushall();
+        fflush(nullptr); 
 
         // Basically we are wrapping it in quotes
         const std::wstring& actual_cmd_line = Strings::wformat(LR"###("%s")###", cmd_line);