[vcpkg] Merge search for dumpbin and toolchain (they are the same).

2 files changed, 7 insertions, 5 deletions

diff --git a/toolsrc/include/cstring_view.h b/toolsrc/include/cstring_view.h
index 88728992b..92f1a6fa5 100644
--- a/toolsrc/include/cstring_view.h
+++ b/toolsrc/include/cstring_view.h
@@ -6,6 +6,7 @@ namespace vcpkg
     template<class CharType>
     struct basic_cstring_view
     {
+        constexpr basic_cstring_view() : cstr(nullptr) {}
         constexpr basic_cstring_view(const CharType* cstr) : cstr(cstr) {}
         basic_cstring_view(const std::basic_string<CharType>& str) : cstr(str.c_str()) {}
 
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index 9577abd01..474f47255 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -7,10 +7,11 @@
 
 namespace vcpkg
 {
-    struct vcvarsall_and_platform_toolset
+    struct toolset_t
     {
-        fs::path path;
-        std::wstring platform_toolset;
+        fs::path dumpbin;
+        fs::path vcvarsall;
+        cwstring_view version;
     };
 
     struct vcpkg_paths
@@ -46,12 +47,12 @@ namespace vcpkg
         const fs::path& get_cmake_exe() const;
         const fs::path& get_git_exe() const;
         const fs::path& get_nuget_exe() const;
-        const fs::path& get_dumpbin_exe() const;
-        const vcvarsall_and_platform_toolset& get_vcvarsall_bat() const;
+        const toolset_t& get_toolset() const;
 
     private:
         lazy<fs::path> cmake_exe;
         lazy<fs::path> git_exe;
         lazy<fs::path> nuget_exe;
+        lazy<toolset_t> toolset;
     };
 }