mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge topic 'gcc-implicit-libs'

Browse Source 
168785c67e GCC: Fix linking mixed C and C++ binaries with GCC 16+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12027
This commit is contained in:
Brad King
2026-05-08 07:36:10 -04:00
committed by Kitware Robot
parent 64b8f7251d 168785c67e
commit f45ff406cd
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmComputeLinkInformation.cxx
+22 -2
View File
@@ -1084,15 +1084,35 @@ void cmComputeLinkInformation::AddRuntimeLinkLibrary(std::string const& lang)
}
}
namespace {
std::string const gcc_s = "gcc_s";
std::string const gcc_s_asneeded = "gcc_s_asneeded";
}
void cmComputeLinkInformation::AddImplicitLinkInfo(std::string const& lang)
{
auto const impliedByLinkerLanguage = [this](std::string const& lib) -> bool {
if (cm::contains(this->ImplicitLinkLibs, lib)) {
return true;
}
// As of GCC 16, `gcc` implies `gcc_s_asneeded` but `g++` implies `gcc_s`.
// Accept them interchangeably when linking mixed C and C++ binaries.
if ((lib == gcc_s_asneeded &&
cm::contains(this->ImplicitLinkLibs, gcc_s)) ||
(lib == gcc_s &&
cm::contains(this->ImplicitLinkLibs, gcc_s_asneeded))) {
return true;
}
return false;
};
// Add libraries for this language that are not implied by the
// linker language.
std::string libVar = cmStrCat("CMAKE_", lang, "_IMPLICIT_LINK_LIBRARIES");
if (cmValue libs = this->Makefile->GetDefinition(libVar)) {
cmList libsList{ *libs };
for (auto const& i : libsList) {
if (!cm::contains(this->ImplicitLinkLibs, i)) {
for (std::string const& i : libsList) {
if (!impliedByLinkerLanguage(i)) {
this->AddItem({ i });
}
}