From e4ce66eecfd3e5cca5eac06c971921bf8e37cf88 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Fri, 22 Jan 2021 17:50:18 -0800 Subject: [vcpkg] Improve diagnostics around compiler tracking and toolset errors. 'Fixes' #15823. (#15825) --- toolsrc/include/vcpkg/build.h | 4 +++- toolsrc/include/vcpkg/vcpkgpaths.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index e873f0ea2..ed2724435 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -232,7 +232,9 @@ namespace vcpkg::Build const VcpkgPaths& m_paths; }; - System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); + System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, + const Toolset& toolset, + View all_toolsets); struct ExtendedBuildResult { diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 8a97b258e..643baf57e 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -148,6 +148,8 @@ namespace vcpkg /// const Toolset& get_toolset(const Build::PreBuildInfo& prebuildinfo) const; + View get_all_toolsets() const; + Files::Filesystem& get_filesystem() const; const System::Environment& get_action_env(const Build::AbiInfo& abi_info) const; -- cgit v1.2.3