dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-07-01 04:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

GCC: Fix linking mixed C and C++ binaries with GCC 16+

Browse Source 
As of GCC 16, `gcc` implies `gcc_s_asneeded` but `g++` implies `gcc_s`.
When linking mixed C and C++ binaries, avoid listing one if the other is
already implied by the linker language.

Fixes: #27796
This commit is contained in:
Brad King
2026-05-07 10:41:57 -04:00
parent 14d9bf456f
commit 168785c67e
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmComputeLinkInformation.cxx
View File

@@ -1083,15 +1083,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 });
}
}