kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

De-duplicate shared library targets in generated link lines 

The linker will bring in shared libraries as a whole and use them even
for symbols that are needed by entries later in the link line.
Therefore we do not need to repeat them.  De-duplicate link entries that
we know are shared libraries because we have a cmTarget associated with
them.

Tested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
This commit is contained in:
Brad King 2014-07-30 11:14:17 -04:00
parent 8d1306cd1b
commit 9f7e27fc3a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmComputeLinkDepends.cxx
View File

@ -166,7 +166,8 @@ guaranteed to be acyclic.
The final list of items produced by this procedure consists of the The final list of items produced by this procedure consists of the
original user link line followed by minimal additional items needed to original user link line followed by minimal additional items needed to
satisfy dependencies. satisfy dependencies. The final list is then filtered to de-duplicate
items that we know the linker will re-use automatically (shared libs).
*/ */
@ -262,10 +263,20 @@ cmComputeLinkDepends::Compute()
this->OrderLinkEntires(); this->OrderLinkEntires();
// Compute the final set of link entries. // Compute the final set of link entries.
std::set<int> emmitted;
for(std::vector<int>::const_iterator li = this->FinalLinkOrder.begin(); for(std::vector<int>::const_iterator li = this->FinalLinkOrder.begin();
li != this->FinalLinkOrder.end(); ++li) li != this->FinalLinkOrder.end(); ++li)
{ {
this->FinalLinkEntries.push_back(this->EntryList[*li]); int i = *li;
LinkEntry const& e = this->EntryList[i];
cmTarget const* t = e.Target;
// Entries that we know the linker will re-use for symbols
// needed by later entries do not need to be repeated.
bool uniquify = t && t->GetType() == cmTarget::SHARED_LIBRARY;
if(!uniquify || emmitted.insert(i).second)
{
this->FinalLinkEntries.push_back(e);
}
} }
// Display the final set. // Display the final set.