diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-04-03 21:05:31 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-04-06 17:24:45 -0700 |
| commit | 31377dee20dad9b95357934732996e2448f2eaf5 (patch) | |
| tree | 770015c4607ba633588ee3c1364544f2949026f9 /toolsrc/src | |
| parent | 997fddb3c1a3acb7579e1fe0ab82436b227a0dc4 (diff) | |
| download | vcpkg-31377dee20dad9b95357934732996e2448f2eaf5.tar.gz vcpkg-31377dee20dad9b95357934732996e2448f2eaf5.zip | |
Use 7z for extracting. Extract tools in downloads/tools
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index bda2c4174..f2086257e 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -115,15 +115,9 @@ namespace vcpkg tool, required_version_as_string); -// Legacy support. Change introduced in vcpkg v0.0.107. -#if !defined(_WIN32) - const std::string tool_dir_name = Strings::format("%s-%s", tool, required_version_as_string); + const std::string tool_dir_name = Strings::format("%s-%s-%s", tool, required_version_as_string, OS_STRING); const fs::path tool_dir_path = paths.downloads / "tools" / tool_dir_name; const fs::path exe_path = tool_dir_path / exe_relative_path; -#else - const fs::path tool_dir_path; - const fs::path exe_path = paths.downloads / exe_relative_path; -#endif return ToolData{*required_version.get(), exe_path, url, |