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,6 @@ 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_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,7 +87,9 @@ if (LLDB_ENABLE_PYTHON)
       set(LLDB_PYTHON_EXT_SUFFIX "_d${LLDB_PYTHON_EXT_SUFFIX}")
     endif()
   endif()
-  get_filename_component(LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME Python3_RUNTIME_LIBRARY NAME)
+  if(DEFINED Python3_RUNTIME_LIBRARY AND NOT Python3_RUNTIME_LIBRARY STREQUAL Python3_RUNTIME_LIBRARY-NOTFOUND)
+    get_filename_component(LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME Python3_RUNTIME_LIBRARY NAME)
+  endif()
 endif ()
 
 if (LLDB_ENABLE_LUA)

lldb/tools/driver/CMakeLists.txt

@@ -37,8 +37,8 @@ add_dependencies(lldb
 if(DEFINED LLDB_PYTHON_DLL_RELATIVE_PATH)
   target_compile_definitions(lldb PRIVATE LLDB_PYTHON_DLL_RELATIVE_PATH="${LLDB_PYTHON_DLL_RELATIVE_PATH}")
 endif()
-if(DEFINED LLDB_PYTHON_SHARED_LIBRARY_FILENAME)
-  target_compile_definitions(lldb PRIVATE LLDB_PYTHON_SHARED_LIBRARY_FILENAME="${LLDB_PYTHON_SHARED_LIBRARY_FILENAME}")
+if(DEFINED LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME)
+  target_compile_definitions(lldb PRIVATE LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME="${LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME}")
 endif()
 
 if(LLDB_BUILD_FRAMEWORK)

lldb/tools/driver/Driver.cpp

@@ -499,10 +499,10 @@ void SetupPythonRuntimeLibrary() {
     return;
 #ifdef LLDB_PYTHON_DLL_RELATIVE_PATH
   if (AddPythonDLLToSearchPath())
-    return
+    return;
 #endif
-        llvm::errs() << "error: unable to find "
-                     << LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME << ".\n";
+  llvm::errs() << "error: unable to find "
+                << LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME << ".\n";
   return;
 #elif defined(LLDB_PYTHON_DLL_RELATIVE_PATH)
   if (!AddPythonDLLToSearchPath())