diff options
Diffstat (limited to 'lldb/scripts/Python/finishSwigPythonLLDB.py')
| -rw-r--r-- | lldb/scripts/Python/finishSwigPythonLLDB.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py index ff6a131..d23e103 100644 --- a/lldb/scripts/Python/finishSwigPythonLLDB.py +++ b/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -365,7 +365,6 @@ def make_symlink_native(vDictArgs, strSrc, strTarget): # Throws: None. #-- - def make_symlink( vDictArgs, vstrFrameworkPythonDir, @@ -377,27 +376,15 @@ def make_symlink( bDbg = "-d" in vDictArgs strTarget = os.path.join(vstrFrameworkPythonDir, vstrTargetFile) strTarget = os.path.normcase(strTarget) - strSrc = "" + strPrefix = vDictArgs['--prefix'] os.chdir(vstrFrameworkPythonDir) bMakeFileCalled = "-m" in vDictArgs eOSType = utilsOsType.determine_os_type() - if not bMakeFileCalled: - strBuildDir = os.path.join("..", "..", "..") - else: - # Resolve vstrSrcFile path relatively the build directory - if eOSType == utilsOsType.EnumOsType.Windows: - # On a Windows platform the vstrFrameworkPythonDir looks like: - # llvm\\build\\Lib\\site-packages\\lldb - strBuildDir = os.path.join("..", "..", "..") - else: - # On a UNIX style platform the vstrFrameworkPythonDir looks like: - # llvm/build/lib/python2.7/site-packages/lldb - strBuildDir = os.path.join("..", "..", "..", "..") - strSrc = os.path.normcase(os.path.join(strBuildDir, vstrSrcFile)) - - return make_symlink_native(vDictArgs, strSrc, strTarget) + strSrc = os.path.normcase(os.path.join(strPrefix, vstrSrcFile)) + strRelSrc = os.path.relpath(strSrc, os.path.dirname(strTarget)) + return make_symlink_native(vDictArgs, strRelSrc, strTarget) #++--------------------------------------------------------------------------- # Details: Make the symbolic that the script bridge for Python will need in |