Explorar o código

BUG: Fix cmSystemTools::ChangeRPath to not complain if there is no RPATH entry in the file but the requested new rpath is empty.

Brad King %!s(int64=17) %!d(string=hai) anos
pai
achega
26e58b74d1
Modificáronse 1 ficheiros con 6 adicións e 0 borrados
  1. 6 0
      Source/cmSystemTools.cxx

+ 6 - 0
Source/cmSystemTools.cxx

@@ -2211,6 +2211,12 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
     rpathPosition = se->Position;
     rpathSize = se->Size;
     }
+  else if(newRPath.empty())
+    {
+    // The new rpath is empty and there is no rpath anyway so it is
+    // okay.
+    return true;
+    }
   else
     {
     if(emsg)