[lldb] Unifying lldb python path

[hhb]

Summary

This is based on mgorny's D67890.

There are 3 places where python site-package path is calculated independently:

1. finishSwigPythonLLDB.py where files are written to site-packages.

2. lldb/scripts/CMakeLists.txt where site-packages are installed.

3. ScriptInterpreterPython.cpp where site-packages are added to PYTHONPATH.

This change creates the path once and use it everywhere. So that they will not go out of sync.

Also it provides a chance for cross compile users to specify the right path for site-packages.

[hhb]

Fix description..

[hhb]

Rebase

[mgorny]

lldb/CMakeLists.txt

42

I still like my (False, False, '') version better than having to recalculate path afterwards.

[hhb]

lldb/CMakeLists.txt

42

I don't have a strong opinion here. Let's see what labath@ think.

That been said, I did this because some distribution modified get_python_lib() to return differently based on prefix. One example is Debian/Ubuntu, where 'dist-packages' will be used if prefix is '', '/usr' or '/usr/local'.

In reality, that only makes difference when CMAKE_INSTALL_PREFIX is set. But I guess it doesn't really matter whether we use 'dist-packages' or 'site-packages' that time, as long as it is consistent everywhere.

[hhb]

lldb/CMakeLists.txt

42

Considering DESTINT, maybe empty string is better...

By the way, what's the first parameter plat_specific? In all platforms I have, it doesn't make any difference...

[mgorny]

lldb/CMakeLists.txt

42

Technically, it's for arch-dependent vs arch-independent modules, i.e. should be True for .so extensions and False for .py modules.

Judging by the documentation, it's only used to switch between sys.base_prefix (i.e. --prefix given to build Python) and sys.base_exec_prefix (--exec-prefix). However, I'm not aware of any platform where two different prefixes are used for Python.

When a prefix is given as third argument, its value is ignored. So True vs False shouldn't really matter here, hence I've left it at the default (False).

[labath]

Thanks for the cleanup. This looks fine to me. I'll leave it up to you to figure out the best way to compute the relative python path...

lldb/CMakeLists.txt

42

All else being equal, I would prefer the version which does not recompute the relative path. However, if there is a meaningful functional difference between the two versions, then we can stick to this one, if it is more correct. As for whether the difference is "meaningful" and which version is more "correct", you guys are probably more qualified to answer that than I am...

lldb/scripts/finishSwigWrapperClasses.py

196

Given that the arg is marked as mandatory here, is there a need for the check in get_framework_python_dir? Maybe that could be an assert ?

[hhb]

lldb/CMakeLists.txt

42

I'll switch to the no recompute version in this patch. While they have some difference, I'm not aware of any platform where that matters. So I'll go with the easier way.

Also it is weird to build differently based on install prefix. Specially the prefix can be overwritten by DESTDIR afterwards..

lldb/scripts/finishSwigWrapperClasses.py

196

Other mandatory parameters do not even have an assert... Remove the check in get_framework_python_dir.

[hhb]

Fix comments

[mgorny]

Cool work. I presume you've tested it. I can test it tomorrow if you need me to. However, I can do that after the commit.

[hhb]

In D68442#1698053, @mgorny wrote:

Cool work. I presume you've tested it. I can test it tomorrow if you need me to. However, I can do that after the commit.

I'm doing a final round of testing on linux/darwin/windows(mingw). I'll commit after that.

[hhb]

Converts python output path to cmake format.

This looks like a bug on windows exists before this change...

[hhb]

Reverts the change related to python dir for windows.

FileSpec should always contain normalized path. I.e. using '/' even in windows.

[hhb]

This is merged as 61f471a and 0016b45. Closing...

lldb/CMakeLists.txt

if(APPLE)
   add_definitions(-DLLDB_USE_OS_LOG)
 endif()
 
 if (WIN32)
   add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
 endif()
 
 if (NOT LLDB_DISABLE_PYTHON)
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE}
+        -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(False, False, ''))"
+    OUTPUT_VARIABLE LLDB_PYTHON_DEFAULT_RELATIVE_PATH
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  file(TO_CMAKE_PATH ${LLDB_PYTHON_DEFAULT_RELATIVE_PATH} LLDB_PYTHON_DEFAULT_RELATIVE_PATH)
+  set(LLDB_PYTHON_RELATIVE_PATH ${LLDB_PYTHON_DEFAULT_RELATIVE_PATH}
+    CACHE STRING "Path where Python modules are installed, relative to install prefix")
+
   add_subdirectory(scripts)
 endif ()
 
 # We need the headers generated by instrinsics_gen before we can compile
 # any source file in LLDB as the imported Clang modules might include
 # some of these generated headers. This approach is copied from Clang's main
 # CMakeLists.txt, so it should kept in sync the code in Clang which was added
 # in llvm-svn 308844.
if(NOT LLDB_BUILD_FRAMEWORK)
       set(use_python_wrapper_from_src_dir -m)
     endif()
     if(LLDB_USE_SYSTEM_SIX)
       set(use_six_py_from_system --useSystemSix)
     endif()
     get_target_property(lldb_scripts_dir swig_wrapper BINARY_DIR)
     get_target_property(liblldb_build_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
 
+    if(LLDB_BUILD_FRAMEWORK)
+      set(lldb_python_build_path "${liblldb_build_dir}/LLDB.framework/Resources/Python/lldb")
+    else()
+      set(lldb_python_build_path "${CMAKE_BINARY_DIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
+    endif()
+
     # Add a Post-Build Event to copy over Python files and create the symlink
     # to liblldb.so for the Python API(hardlink on Windows).
     add_custom_target(finish_swig ALL
         COMMAND
            ${PYTHON_EXECUTABLE} ${LLDB_SOURCE_DIR}/scripts/finishSwigWrapperClasses.py
                --srcRoot=${LLDB_SOURCE_DIR}
                --targetDir=${liblldb_build_dir}
                --cfgBldDir=${lldb_scripts_dir}
                --prefix=${CMAKE_BINARY_DIR}
                --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}
                --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX}
+               --lldbPythonPath=${lldb_python_build_path}
                ${use_python_wrapper_from_src_dir}
                ${use_six_py_from_system}
         VERBATIM
         DEPENDS ${LLDB_SOURCE_DIR}/scripts/finishSwigWrapperClasses.py
         DEPENDS ${lldb_scripts_dir}/lldb.py
         COMMENT "Python script sym-linking LLDB Python API")
 
     add_dependencies(finish_swig swig_wrapper liblldb lldb-argdumper)
     set_target_properties(finish_swig swig_wrapper PROPERTIES FOLDER "lldb misc")
 
     # Ensure we do the python post-build step when building lldb.
     add_dependencies(lldb finish_swig)
 
+    if(NOT LLDB_BUILD_FRAMEWORK)
+      # Install the LLDB python module
+      add_custom_target(lldb-python-scripts)
+      add_dependencies(lldb-python-scripts finish_swig)
+      install(DIRECTORY ${CMAKE_BINARY_DIR}/${LLDB_PYTHON_RELATIVE_PATH}/
+              DESTINATION ${LLDB_PYTHON_RELATIVE_PATH}
+              COMPONENT lldb-scripts)
+      if (NOT LLVM_ENABLE_IDE)
+        add_llvm_install_targets(install-lldb-python-scripts
+                                 COMPONENT lldb-python-scripts
+                                 DEPENDS lldb-python-scripts)
+      endif()
+    endif()
+
     # Add a Post-Build Event to copy the custom Python DLL to the lldb binaries dir so that Windows can find it when launching
     # lldb.exe or any other executables that were linked with liblldb.
     if (WIN32 AND NOT "${PYTHON_DLL}" STREQUAL "")
         # When using the Visual Studio CMake generator the lldb binaries end up in Release/bin, Debug/bin etc.
         file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin" LLDB_BIN_DIR)
         file(TO_NATIVE_PATH "${PYTHON_DLL}" PYTHON_DLL_NATIVE_PATH)
         add_custom_command(
             TARGET finish_swig

lldb/scripts/CMakeLists.txt

add_custom_command(
   VERBATIM
   COMMENT "Builds LLDB Python wrapper")
 
 add_custom_target(swig_wrapper ALL DEPENDS
   ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/lldb.py
 )
 
-if(NOT LLDB_BUILD_FRAMEWORK)
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE}
-        -c "import distutils.sysconfig, sys; print(distutils.sysconfig.get_python_lib(True, False, sys.argv[1]))"
-        ${CMAKE_BINARY_DIR}
-    OUTPUT_VARIABLE SWIG_PYTHON_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE}
-        -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True, False, ''))"
-    OUTPUT_VARIABLE SWIG_INSTALL_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  # Install the LLDB python module
-  add_custom_target(lldb-python-scripts)
-  add_dependencies(lldb-python-scripts finish_swig)
-  install(DIRECTORY ${SWIG_PYTHON_DIR}/
-    DESTINATION ${SWIG_INSTALL_DIR}
-    COMPONENT lldb-scripts)
-  if (NOT LLVM_ENABLE_IDE)
-    add_llvm_install_targets(install-lldb-python-scripts
-                             COMPONENT lldb-python-scripts
-                             DEPENDS lldb-python-scripts)
-  endif()
-endif()

lldb/scripts/Python/finishSwigPythonLLDB.py

def get_config_build_dir(vDictArgs, vstrFrameworkPythonDir):
     bHaveConfigBldDir = "--cfgBldDir" in vDictArgs
     if bHaveConfigBldDir:
         strConfigBldDir = vDictArgs["--cfgBldDir"]
     if (bHaveConfigBldDir == False) or (strConfigBldDir.__len__() == 0):
         strConfigBldDir = vstrFrameworkPythonDir
 
     return (bOk, strConfigBldDir, strErrMsg)
 
-#++---------------------------------------------------------------------------
-# Details:  Determine where to put the files. Retrieve the directory path for
-#           Python's dist_packages/ site_package folder on a Windows platform.
-# Args:     vDictArgs   - (R) Program input parameters.
-# Returns:  Bool - True = function success, False = failure.
-#           Str - Python Framework directory path.
-#           strErrMsg - Error description on task failure.
-# Throws:   None.
-#--
-
-
-def get_framework_python_dir_windows(vDictArgs):
-    dbg = utilsDebug.CDebugFnVerbose(
-        "Python script get_framework_python_dir_windows()")
-    bOk = True
-    strWkDir = ""
-    strErrMsg = ""
-
-    # We are being built by LLVM, so use the PYTHON_INSTALL_DIR argument,
-    # and append the python version directory to the end of it.  Depending
-    # on the system other stuff may need to be put here as well.
-    from distutils.sysconfig import get_python_lib
-    strPythonInstallDir = ""
-    bHaveArgPrefix = "--prefix" in vDictArgs
-    if bHaveArgPrefix:
-        strPythonInstallDir = os.path.normpath(vDictArgs["--prefix"])
-
-    bHaveArgCmakeBuildConfiguration = "--cmakeBuildConfiguration" in vDictArgs
-    if bHaveArgCmakeBuildConfiguration:
-        strPythonInstallDir = os.path.join(
-            strPythonInstallDir,
-            vDictArgs["--cmakeBuildConfiguration"])
-
-    if strPythonInstallDir.__len__() != 0:
-        strWkDir = get_python_lib(True, False, strPythonInstallDir)
-    else:
-        strWkDir = get_python_lib(True, False)
-    strWkDir = os.path.normcase(os.path.join(strWkDir, "lldb"))
-
-    return (bOk, strWkDir, strErrMsg)
-
-#++---------------------------------------------------------------------------
-# Details:  Retrieve the directory path for Python's dist_packages/
-#           site_package folder on a UNIX style platform.
-# Args:     vDictArgs   - (R) Program input parameters.
-# Returns:  Bool - True = function success, False = failure.
-#           Str - Python Framework directory path.
-#           strErrMsg - Error description on task failure.
-# Throws:   None.
-#--
-
-
-def get_framework_python_dir_other_platforms(vDictArgs):
-    dbg = utilsDebug.CDebugFnVerbose(
-        "Python script get_framework_python_dir_other_platform()")
-    bOk = True
-    strWkDir = ""
-    strErrMsg = ""
-    bDbg = "-d" in vDictArgs
-
-    bMakeFileCalled = "-m" in vDictArgs
-    if bMakeFileCalled:
-        dbg.dump_text("Built by LLVM")
-        return get_framework_python_dir_windows(vDictArgs)
-    else:
-        dbg.dump_text("Built by XCode")
-        # We are being built by XCode, so all the lldb Python files can go
-        # into the LLDB.framework/Resources/Python subdirectory.
-        strWkDir = vDictArgs["--targetDir"]
-        strWkDir = os.path.join(strWkDir, "LLDB.framework")
-        if os.path.exists(strWkDir):
-            if bDbg:
-                print((strMsgFoundLldbFrameWkDir % strWkDir))
-            strWkDir = os.path.join(strWkDir, "Resources", "Python", "lldb")
-            strWkDir = os.path.normcase(strWkDir)
-        else:
-            bOk = False
-            strErrMsg = strErrMsgFrameWkPyDirNotExist % strWkDir
-
-    return (bOk, strWkDir, strErrMsg)
 
 #++---------------------------------------------------------------------------
 # Details:  Retrieve the directory path for Python's dist_packages/
 #           site_package folder depending on the type of OS platform being
 #           used.
 # Args:     vDictArgs   - (R) Program input parameters.
 # Returns:  Bool - True = function success, False = failure.
 #           Str - Python Framework directory path.
 #           strErrMsg - Error description on task failure.
 # Throws:   None.
 #--
 
 
 def get_framework_python_dir(vDictArgs):
     dbg = utilsDebug.CDebugFnVerbose(
         "Python script get_framework_python_dir()")
     bOk = True
-    strWkDir = ""
     strErrMsg = ""
-
-    eOSType = utilsOsType.determine_os_type()
-    if eOSType == utilsOsType.EnumOsType.Unknown:
-        bOk = False
-        strErrMsg = strErrMsgOsTypeUnknown
-    elif eOSType == utilsOsType.EnumOsType.Windows:
-        bOk, strWkDir, strErrMsg = get_framework_python_dir_windows(vDictArgs)
-    else:
-        bOk, strWkDir, strErrMsg = get_framework_python_dir_other_platforms(
-            vDictArgs)
-
+    strWkDir = os.path.normpath(vDictArgs["--lldbPythonPath"])
     return (bOk, strWkDir, strErrMsg)
 
 #++---------------------------------------------------------------------------
 # Details:  Retrieve the liblldb directory path, if it exists and is valid.
 # Args:     vDictArgs               - (R) Program input parameters.
 # Returns:  Bool - True = function success, False = failure.
 #           Str - liblldb directory path.
 #           strErrMsg - Error description on task failure.

lldb/scripts/finishSwigWrapperClasses.py

def validate_arguments(vArgv):
     strListArgs = "hdm"  # Format "hiox:" = -h -i -o -x <arg>
     listLongArgs = [
         "srcRoot=",
         "targetDir=",
         "cfgBldDir=",
         "prefix=",
         "cmakeBuildConfiguration=",
         "lldbLibDir=",
+        "lldbPythonPath=",
         "argsFile",
         "useSystemSix"]
     dictArgReq = {"-h": "o",          # o = optional, m = mandatory
                   "-d": "o",
                   "-m": "o",
                   "--srcRoot": "m",
                   "--targetDir": "m",
                   "--cfgBldDir": "o",
                   "--prefix": "o",
                   "--cmakeBuildConfiguration": "o",
                   "--lldbLibDir": "o",
                   "--argsFile": "o",
-                  "--useSystemSix": "o"}
+                  "--useSystemSix": "o",
+                  "--lldbPythonPath": "m"}
 
     # Check for mandatory parameters
     nResult, dictArgs, strMsg = utilsArgsParse.parse(vArgv, strListArgs,
                                                      listLongArgs,
                                                      dictArgReq,
                                                      strHelpInfo)
     if nResult < 0:
         program_exit_on_failure(nResult, strMsg)
def run_post_process_for_each_script_supported(vDictArgs):
     if not bOk:
         return (-8, strScriptDirNotFound)
 
     # Look for any script language directories to build for
     listDirs = ["Python"]
 
     # Iterate script directory find any script language directories
     for scriptLang in listDirs:
-        # __pycache__ is a magic directory in Python 3 that holds .pyc files
-        if scriptLang != "__pycache__" and scriptLang != "swig_bot_lib":
-            dbg.dump_text("Executing language script for \'%s\'" % scriptLang)
-            nResult, strStatusMsg = run_post_process(
-                scriptLang, strFinishFileName, vDictArgs)
         if nResult < 0:
             break
 
     if nResult < 0:
         strTmp = strPostProcessError % scriptLang
         strTmp += strStatusMsg
         strStatusMsg = strTmp
 
def main(vArgv):
     if eOSType == utilsOsType.EnumOsType.Unknown:
         program_exit(-4, strMsgErrorOsTypeUnknown)
 
     global gbDbgFlag
     gbDbgFlag = "-d" in dictArgs
     if gbDbgFlag:
         print_out_input_parameters(dictArgs)
 
-    # Check to see if we were called from the Makefile system. If we were, check
-    # if the caller wants SWIG to generate a dependency file.
-    # Not used in this program, but passed through to the language script file
-    # called by this program
-    global gbMakeFileFlag
-    gbMakeFileFlag = "-m" in dictArgs
-
     nResult, strMsg = run_post_process_for_each_script_supported(dictArgs)
 
     program_exit(nResult, strMsg)
 
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------
 

lldb/scripts/get_relative_lib_dir.py

-import distutils.sysconfig
-import os
-import platform
-import re
-import sys
-
-
-def get_python_relative_libdir():
-    """Returns the appropropriate python libdir relative to the build directory.
-
-    @param exe_path the path to the lldb executable
-
-    @return the python path that needs to be added to sys.path (PYTHONPATH)
-    in order to find the lldb python module.
-    """
-    if platform.system() != 'Linux':
-        return None
-
-    # We currently have a bug in lldb -P that does not account for
-    # architecture variants in python paths for
-    # architecture-specific modules.  Handle the lookup here.
-    # When that bug is fixed, we should just ask lldb for the
-    # right answer always.
-    arch_specific_libdir = distutils.sysconfig.get_python_lib(True, False)
-    split_libdir = arch_specific_libdir.split(os.sep)
-    lib_re = re.compile(r"^lib.*$")
-
-    for i in range(len(split_libdir)):
-        match = lib_re.match(split_libdir[i])
-        if match is not None:
-            # We'll call this the relative root of the lib dir.
-            # Things like RHEL will have an arch-specific python
-            # lib dir, which isn't 'lib' on x86_64.
-            return os.sep.join(split_libdir[i:])
-    # Didn't resolve it.
-    return None
-
-if __name__ == '__main__':
-    lib_dir = get_python_relative_libdir()
-    if lib_dir is not None:
-        sys.stdout.write(lib_dir)
-        sys.exit(0)
-    else:
-        sys.exit(1)

lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt

-if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
-  # Call a python script to gather the arch-specific libdir for
-  # modules like the lldb module.
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../scripts/get_relative_lib_dir.py
-    RESULT_VARIABLE get_libdir_status
-    OUTPUT_VARIABLE relative_libdir
-    )
-  if (get_libdir_status EQUAL 0)
-    add_definitions(-DLLDB_PYTHON_RELATIVE_LIBDIR="${relative_libdir}")
-  endif()
+if(NOT LLDB_PYTHON_RELATIVE_PATH)
+  message(FATAL_ERROR "LLDB_PYTHON_RELATIVE_PATH is not set.")
 endif()
+add_definitions(-DLLDB_PYTHON_RELATIVE_LIBDIR="${LLDB_PYTHON_RELATIVE_PATH}")
 
 add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN
   PythonDataObjects.cpp
   PythonExceptionState.cpp
   ScriptInterpreterPython.cpp
 
   LINK_LIBS
     lldbBreakpoint

lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h

public:
   static void Initialize();
   static void Terminate();
   static lldb_private::ConstString GetPluginNameStatic();
   static const char *GetPluginDescriptionStatic();
   static FileSpec GetPythonDir();
 
 protected:
   static void ComputePythonDirForApple(llvm::SmallVectorImpl<char> &path);
-  static void ComputePythonDirForPosix(llvm::SmallVectorImpl<char> &path);
-  static void ComputePythonDirForWindows(llvm::SmallVectorImpl<char> &path);
+  static void ComputePythonDir(llvm::SmallVectorImpl<char> &path);
 };
 } // namespace lldb_private
 
 #endif // LLDB_DISABLE_PYTHON
 #endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H

lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp

void ScriptInterpreterPython::ComputePythonDirForApple(
     llvm::SmallVectorImpl<char> &path) {
   auto style = llvm::sys::path::Style::posix;
 
   llvm::StringRef path_ref(path.begin(), path.size());
   auto rbegin = llvm::sys::path::rbegin(path_ref, style);
   auto rend = llvm::sys::path::rend(path_ref);
   auto framework = std::find(rbegin, rend, "LLDB.framework");
   if (framework == rend) {
-    ComputePythonDirForPosix(path);
+    ComputePythonDir(path);
     return;
   }
   path.resize(framework - rend);
   llvm::sys::path::append(path, style, "LLDB.framework", "Resources", "Python");
 }
 
-void ScriptInterpreterPython::ComputePythonDirForPosix(
+void ScriptInterpreterPython::ComputePythonDir(
     llvm::SmallVectorImpl<char> &path) {
-  auto style = llvm::sys::path::Style::posix;
-#if defined(LLDB_PYTHON_RELATIVE_LIBDIR)
   // Build the path by backing out of the lib dir, then building with whatever
   // the real python interpreter uses.  (e.g. lib for most, lib64 on RHEL
-  // x86_64).
-  llvm::sys::path::remove_filename(path, style);
-  llvm::sys::path::append(path, style, LLDB_PYTHON_RELATIVE_LIBDIR);
-#else
-  llvm::sys::path::append(path, style,
-                          "python" + llvm::Twine(PY_MAJOR_VERSION) + "." +
-                              llvm::Twine(PY_MINOR_VERSION),
-                          "site-packages");
-#endif
-}
-
-void ScriptInterpreterPython::ComputePythonDirForWindows(
-    llvm::SmallVectorImpl<char> &path) {
-  auto style = llvm::sys::path::Style::windows;
-  llvm::sys::path::remove_filename(path, style);
-  llvm::sys::path::append(path, style, "lib", "site-packages");
+  // x86_64, or bin on Windows).
+  llvm::sys::path::remove_filename(path);
+  llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);
 
+#if defined(_WIN32)
   // This will be injected directly through FileSpec.GetDirectory().SetString(),
   // so we need to normalize manually.
   std::replace(path.begin(), path.end(), '\\', '/');
+#endif
 }
 
 FileSpec ScriptInterpreterPython::GetPythonDir() {
   static FileSpec g_spec = []() {
     FileSpec spec = HostInfo::GetShlibDir();
     if (!spec)
       return FileSpec();
     llvm::SmallString<64> path;
     spec.GetPath(path);
 
 #if defined(__APPLE__)
     ComputePythonDirForApple(path);
-#elif defined(_WIN32)
-    ComputePythonDirForWindows(path);
 #else
-    ComputePythonDirForPosix(path);
+    ComputePythonDir(path);
 #endif
     spec.GetDirectory().SetString(path);
     return spec;
   }();
   return g_spec;
 }
 
 lldb_private::ConstString ScriptInterpreterPython::GetPluginNameStatic() {