[Cmake-commits] [cmake-commits] king committed cmComputeLinkInformation.cxx 1.46 1.47

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12070/Source

Modified Files:
	cmComputeLinkInformation.cxx 
Log Message:
BUG: Do not create empty build-tree RPATH

The fix for issue #9130 appends ':' to the end of the build-tree RPATH
unconditionally.  This changes the fix to add ':' only when the RPATH is
not empty so that we do not create a build-tree RPATH with just ':'.  An
empty RPATH produces no string at all, so there is no chance of merging
with a symbol name anyway.


Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -C 2 -d -r1.46 -r1.47
*** cmComputeLinkInformation.cxx	10 Jun 2009 18:11:40 -0000	1.46
--- cmComputeLinkInformation.cxx	11 Jun 2009 18:57:47 -0000	1.47
***************
*** 1709,1716 ****
    if(!for_install && this->RuntimeUseChrpath)
      {
!     // Always add one trailing separator so the linker does not re-use
!     // the rpath .dynstr entry for a symbol name that happens to match
!     // the end of the rpath string.
!     rpath += this->GetRuntimeSep();
  
      // Make sure it is long enough to hold the replacement value.
--- 1709,1719 ----
    if(!for_install && this->RuntimeUseChrpath)
      {
!     if(!rpath.empty())
!       {
!       // Add one trailing separator so the linker does not re-use the
!       // rpath .dynstr entry for a symbol name that happens to match
!       // the end of the rpath string.
!       rpath += this->GetRuntimeSep();
!       }
  
      // Make sure it is long enough to hold the replacement value.