mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cache-ldconfigpaths'

Browse Source 
f173ca21ca cmBinUtilsLinuxELFLinker: Cache ldconfig results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8811
This commit is contained in:
Brad King
2023-09-20 13:46:26 +00:00
committed by Kitware Robot
parent 59f6892ab7 f173ca21ca
commit 3a21087282
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmBinUtilsLinuxELFLinker.cxx
+5 -6
View File
@@ -73,6 +73,9 @@ bool cmBinUtilsLinuxELFLinker::Prepare()
if (ldConfigTool == "ldconfig") {
this->LDConfigTool =
cm::make_unique<cmLDConfigLDConfigTool>(this->Archive);
if (!this->LDConfigTool->GetLDConfigPaths(this->LDConfigPaths)) {
return false;
}
} else {
std::ostringstream e;
e << "Invalid value for CMAKE_LDCONFIG_TOOL: " << ldConfigTool;
@@ -132,12 +135,8 @@ bool cmBinUtilsLinuxELFLinker::ScanDependencies(
parentRpaths.end());
}
std::vector<std::string> ldConfigPaths;
if (!this->LDConfigTool->GetLDConfigPaths(ldConfigPaths)) {
return false;
}
searchPaths.insert(searchPaths.end(), ldConfigPaths.begin(),
ldConfigPaths.end());
searchPaths.insert(searchPaths.end(), this->LDConfigPaths.begin(),
this->LDConfigPaths.end());
for (auto const& dep : needed) {
if (!this->Archive->IsPreExcluded(dep)) {