summaryrefslogtreecommitdiffstats
path: root/lldb/scripts/Python/finishSwigPythonLLDB.py
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-11-02 22:13:13 +0000
committerZachary Turner <zturner@google.com>2015-11-02 22:13:13 +0000
commita7cd16b252c68bd7e79ba52bdab8f5c377ca4fd2 (patch)
tree4a837270107df75b113a7db9654a24bf41911ae9 /lldb/scripts/Python/finishSwigPythonLLDB.py
parentd7153101621bd09b6f07371a75c0f316085e8e62 (diff)
downloadbcm5719-llvm-a7cd16b252c68bd7e79ba52bdab8f5c377ca4fd2.tar.gz
bcm5719-llvm-a7cd16b252c68bd7e79ba52bdab8f5c377ca4fd2.zip
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. llvm-svn: 251840
Diffstat (limited to 'lldb/scripts/Python/finishSwigPythonLLDB.py')
-rw-r--r--lldb/scripts/Python/finishSwigPythonLLDB.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py
index bd49adee136..45cb8b98887 100644
--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -304,8 +304,6 @@ def make_symlink( vDictArgs, vstrFrameworkPythonDir, vstrSrcFile, vstrTargetFile
# 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, vstrFrameworkPythonDir, vstrLiblldbFileName
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);
OpenPOWER on IntegriCloud