diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-22 15:00:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-22 15:00:03 (GMT) |
| commit | 9755fd0e6c9a08dc40e922942d608d52542de9d6 (patch) | |
| tree | 3eb4b08391515921bf6bac2fb1634eb128786661 | |
| parent | 90f5845e72a1cd485673940f637afef4730de6a9 (diff) | |
| parent | 107dcac3e03b6334a4415c0028c6111e3acb8b23 (diff) | |
| download | CMake-9755fd0e6c9a08dc40e922942d608d52542de9d6.zip CMake-9755fd0e6c9a08dc40e922942d608d52542de9d6.tar.gz CMake-9755fd0e6c9a08dc40e922942d608d52542de9d6.tar.bz2 | |
Merge branch 'backport-suncc-fixes' into release
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 1fb8f30..a636d23 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -266,9 +266,10 @@ cmComputeLinkDepends::Compute() // Iterate in reverse order so we can keep only the last occurrence // of a shared library. std::set<int> emmitted; + const std::vector<int>& cFLO = this->FinalLinkOrder; for(std::vector<int>::const_reverse_iterator - li = this->FinalLinkOrder.rbegin(), - le = this->FinalLinkOrder.rend(); + li = cFLO.rbegin(), + le = cFLO.rend(); li != le; ++li) { int i = *li; |