fixup! [lldb][windows] print an error if python.dll is not in the DLL search path

Author: charles-zablit

lldb/CMakeLists.txt

@@ -61,8 +61,8 @@ if (LLDB_ENABLE_PYTHON)
     "Path to python interpreter exectuable, relative to python's install prefix")
   set(cachestring_LLDB_PYTHON_EXT_SUFFIX
     "Filename extension for native code python modules")
-  set(cachestring_LLDB_PYTHON_SHARED_LIBRARY_NAME
-    "Filename of Python's shared library")
+  set(cachestring_LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME
+    "Filename of Python's runtime library")
 
   foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH LLDB_PYTHON_EXT_SUFFIX)
     if(NOT DEFINED ${var} AND NOT CMAKE_CROSSCOMPILING)
@@ -89,8 +89,7 @@ if (LLDB_ENABLE_PYTHON)
       set(LLDB_PYTHON_EXT_SUFFIX "_d${LLDB_PYTHON_EXT_SUFFIX}")
     endif()
   endif()
-  set(LLDB_PYTHON_SHARED_LIBRARY_FILENAME
-    "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  get_filename_component(LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME Python3_RUNTIME_LIBRARY NAME)
 endif ()
 
 if (LLDB_ENABLE_LUA)

lldb/tools/driver/Driver.cpp

@@ -477,21 +477,33 @@ bool AddPythonDLLToSearchPath() {
 }
 #endif
 
-#ifdef LLDB_PYTHON_SHARED_LIBRARY_FILENAME
+#ifdef LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME
 /// Returns whether `python3x.dll` is in the DLL search path.
 bool IsPythonDLLInPath() {
 #define WIDEN2(x) L##x
 #define WIDEN(x) WIDEN2(x)
   WCHAR foundPath[MAX_PATH];
   DWORD result =
-      SearchPathW(nullptr, WIDEN(LLDB_PYTHON_SHARED_LIBRARY_FILENAME), nullptr,
+      SearchPathW(nullptr, WIDEN(LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME), nullptr,
                   MAX_PATH, foundPath, nullptr);
 #undef WIDEN2
 #undef WIDEN
 
   return result > 0;
 }
 #endif
+
+void SetupPythonRuntimeLibrary() {
+#ifdef LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME
+  if (!IsPythonDLLInPath())
+#ifdef LLDB_PYTHON_DLL_RELATIVE_PATH
+    if (AddPythonDLLToSearchPath())
+      return
+#endif
+          llvm::errs() << "error: unable to find "
+                       << LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME << ".\n";
+#endif
+}
 #endif
 
 std::string EscapeString(std::string arg) {
@@ -796,13 +808,8 @@ int main(int argc, char const *argv[]) {
                         "~/Library/Logs/DiagnosticReports/.\n");
 #endif
 
-#if defined(_WIN32) && defined(LLDB_PYTHON_SHARED_LIBRARY_FILENAME)
-  if (!IsPythonDLLInPath())
-#ifdef LLDB_PYTHON_DLL_RELATIVE_PATH
-    if (!AddPythonDLLToSearchPath())
-#endif
-      llvm::errs() << "error: unable to find "
-                   << LLDB_PYTHON_SHARED_LIBRARY_FILENAME << ".\n";
+#ifdef _WIN32
+  SetupPythonRuntimeLibrary();
 #endif
 
   // Parse arguments.