diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-05 22:02:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 22:02:51 -0700 |
| commit | 4c33195759bfc2b3bde8628a6617f46040721330 (patch) | |
| tree | d65e6fa538d5efe022a5886a16adc8c5984a9b94 /toolsrc/src/vcpkg_Build.cpp | |
| parent | 77e556a18622fdce4d9ea6c8230c11c5cf9ce3f6 (diff) | |
| parent | 60825eed0e8b8c7646d0e66bc2743b4a1e8e4a96 (diff) | |
| download | vcpkg-4c33195759bfc2b3bde8628a6617f46040721330.tar.gz vcpkg-4c33195759bfc2b3bde8628a6617f46040721330.zip | |
Merge pull request #1213 from albertziegenhagel/request-toolset-version
Specify toolset version
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 = |