diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-01-22 17:50:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 17:50:18 -0800 |
| commit | e4ce66eecfd3e5cca5eac06c971921bf8e37cf88 (patch) | |
| tree | 33e6588b5a1179a8bd8b39796bad66c978014e3b /toolsrc/include | |
| parent | 57465e9bfc916132ca4cd03adb978d62b445238b (diff) | |
| download | vcpkg-e4ce66eecfd3e5cca5eac06c971921bf8e37cf88.tar.gz vcpkg-e4ce66eecfd3e5cca5eac06c971921bf8e37cf88.zip | |
[vcpkg] Improve diagnostics around compiler tracking and toolset errors. 'Fixes' #15823. (#15825)
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 4 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/vcpkgpaths.h | 2 |
2 files changed, 5 insertions, 1 deletions
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<Toolset> 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 /// </remarks> const Toolset& get_toolset(const Build::PreBuildInfo& prebuildinfo) const; + View<Toolset> get_all_toolsets() const; + Files::Filesystem& get_filesystem() const; const System::Environment& get_action_env(const Build::AbiInfo& abi_info) const; |