mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 16:50:29 -04:00
be58b09c1d
Announcements: https://www.kitware.com/cmake-3-28-0-available-for-download/ https://www.kitware.com/cmake-3-28-1-available-for-download/ Release notes: https://cmake.org/cmake/help/latest/release/3.28.html PR: 275730 Exp-run by: antoine
32 lines
998 B
C++
32 lines
998 B
C++
FreeBSD's ldconfig(8) is largely incompatible with that from glibc. Ignore
|
|
these extra paths and just rely on those provided by objdump(1).
|
|
|
|
--- Source/cmBinUtilsLinuxELFLinker.cxx.orig 2023-12-06 13:57:42 UTC
|
|
+++ Source/cmBinUtilsLinuxELFLinker.cxx
|
|
@@ -65,6 +65,7 @@ bool cmBinUtilsLinuxELFLinker::Prepare()
|
|
return false;
|
|
}
|
|
|
|
+#if defined(__linux__)
|
|
std::string ldConfigTool =
|
|
this->Archive->GetMakefile()->GetSafeDefinition("CMAKE_LDCONFIG_TOOL");
|
|
if (ldConfigTool.empty()) {
|
|
@@ -82,6 +83,7 @@ bool cmBinUtilsLinuxELFLinker::Prepare()
|
|
this->SetError(e.str());
|
|
return false;
|
|
}
|
|
+#endif
|
|
|
|
return true;
|
|
}
|
|
@@ -135,8 +137,10 @@ bool cmBinUtilsLinuxELFLinker::ScanDependencies(
|
|
parentRpaths.end());
|
|
}
|
|
|
|
+#if defined(__linux__)
|
|
searchPaths.insert(searchPaths.end(), this->LDConfigPaths.begin(),
|
|
this->LDConfigPaths.end());
|
|
+#endif
|
|
|
|
for (auto const& dep : needed) {
|
|
if (!this->Archive->IsPreExcluded(dep)) {
|