3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 04:28:01 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] Remove unused function (#12837)

Browse Source 
updating use of Span<>

after clang-format

two changes undone
This commit is contained in:
Ignacio Rodríguez 2020-08-17 22:31:45 +07:00 committed by GitHub
parent f0dbdbaa65
commit 5dd2b6736b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolsrc/src/vcpkg/base/system.cpp
View File

@ -160,25 +160,6 @@ namespace vcpkg
return s_home;
}
#else
static const ExpectedS<fs::path>& get_xdg_config_home() noexcept
{
static ExpectedS<fs::path> s_home = [] {
auto maybe_home = System::get_environment_variable("XDG_CONFIG_HOME");
if (auto p = maybe_home.get())
{
return ExpectedS<fs::path>(fs::u8path(*p));
}
else
{
return System::get_home_dir().map([](fs::path home) {
home /= fs::u8path(".config");
return home;
});
}
}();
return s_home;
}
static const ExpectedS<fs::path>& get_xdg_cache_home() noexcept
{
static ExpectedS<fs::path> s_home = [] {

15
toolsrc/src/vcpkg/build.cpp
View File

@ -88,7 +88,7 @@ namespace vcpkg::Build
{
auto var_provider_storage = CMakeVars::make_triplet_cmake_var_provider(paths);
auto& var_provider = *var_provider_storage;
var_provider.load_dep_info_vars(std::array<PackageSpec, 1>{full_spec.package_spec});
var_provider.load_dep_info_vars({{full_spec.package_spec}});
StatusParagraphs status_db = database_load_check(paths);
@ -301,9 +301,9 @@ namespace vcpkg::Build
}));
}
#if defined(_WIN32)
const System::Environment& EnvCache::get_action_env(const VcpkgPaths& paths, const AbiInfo& abi_info)
{
#if defined(_WIN32)
std::string build_env_cmd =
make_build_env_cmd(*abi_info.pre_build_info, abi_info.toolset.value_or_exit(VCPKG_LINE_INFO));
@ -339,10 +339,13 @@ namespace vcpkg::Build
else
return System::cmd_execute_modify_env(build_env_cmd, clean_env);
});
#else
return System::get_clean_environment();
#endif
}
#else
const System::Environment& EnvCache::get_action_env(const VcpkgPaths&, const AbiInfo&)
{
return System::get_clean_environment();
}
#endif
static std::string load_compiler_hash(const VcpkgPaths& paths, const AbiInfo& abi_info);
@ -523,7 +526,7 @@ namespace vcpkg::Build
}
Checks::check_exit(VCPKG_LINE_INFO,
!compiler_hash.empty(),
"Error occured while detecting compiler information. Pass `--debug` for more information.");
"Error occurred while detecting compiler information. Pass `--debug` for more information.");
Debug::print("Detecting compiler hash for triplet ", triplet, ": ", compiler_hash, "\n");
return compiler_hash;