diff options
| author | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2017-06-02 18:13:12 +0200 |
|---|---|---|
| committer | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2017-06-02 18:13:12 +0200 |
| commit | 1253b875195590e528d8a28e12a798264603ba43 (patch) | |
| tree | 1437afe08ae54110f42c442bcb0d8a487cd01367 /toolsrc/src/vcpkg_Build.cpp | |
| parent | 3ebcdd384b58ff5d5f92996a6eb2e9fed0be1710 (diff) | |
| download | vcpkg-1253b875195590e528d8a28e12a798264603ba43.tar.gz vcpkg-1253b875195590e528d8a28e12a798264603ba43.zip | |
Implement support to request a specific toolset version via the variable `VCPKG_PLATFORM_TOOLSET` in the triplet file
Diffstat (limited to 'toolsrc/src/vcpkg_Build.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Build.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg_Build.cpp index d44a673fc..817febe2f 100644 --- a/toolsrc/src/vcpkg_Build.cpp +++ b/toolsrc/src/vcpkg_Build.cpp @@ -128,8 +128,8 @@ namespace vcpkg::Build const fs::path& git_exe_path = paths.get_git_exe(); const fs::path ports_cmake_script_path = paths.ports_cmake; - const Toolset& toolset = paths.get_toolset(); auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet); + const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset); const auto cmd_set_environment = make_build_env_cmd(pre_build_info, toolset); const std::wstring cmd_launch_cmake = |