[Lldb-commits] [lldb] r251840 - Revert part of r239007 related to creating the Python symlink.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Mon Nov  2 16:13:13 2015
New Revision: 251840

URL: http://llvm.org/viewvc/llvm-project?rev=251840&view=rev
Log:
Revert part of r239007 related to creating the Python symlink.

This has apparently been broken since June, but only on non-Windows.
Perhaps nobody noticed it because if the symlink is already there
it won't try to re-create it, and nobody ever tried doing a clean
build.

In any case, I will let the original author attempt to fix this if
he is still interested.  the problem is that in the normal case
of not setting BUILD_SHARED_LIBS and simply running ninja, it would
link _lldb.so to a non-existent location, creating a dangling
symlink.

Modified:
    lldb/trunk/scripts/Python/finishSwigPythonLLDB.py

Modified: lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/finishSwigPythonLLDB.py?rev=251840&r1=251839&r2=251840&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/finishSwigPythonLLDB.py (original)
+++ lldb/trunk/scripts/Python/finishSwigPythonLLDB.py Mon Nov  2 16:13:13 2015
@@ -304,8 +304,6 @@ def make_symlink( vDictArgs, vstrFramewo
             # llvm/build/lib/python2.7/site-packages/lldb
             strBuildDir = os.path.join("..", "..", "..", "..");
         strSrc = os.path.normcase(os.path.join(strBuildDir, vstrSrcFile));
-        strTargetDir = os.path.dirname(strTarget);
-        strSrc = os.path.relpath(os.path.abspath(strSrc), strTargetDir);
 
     if eOSType == utilsOsType.EnumOsType.Unknown:
         bOk = False;
@@ -373,13 +371,6 @@ def make_symlink_liblldb( vDictArgs, vst
                 strLibFileExtn = ".so";
             strSrc = os.path.join("lib", "liblldb" + strLibFileExtn);
 
-    if eOSType != utilsOsType.EnumOsType.Windows:
-        # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is
-        # effective.
-        bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") );
-        if not bOk:
-            return (bOk, strErrMsg)
-
     bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
 
     return (bOk, strErrMsg);