check if the Python target is defined

Author: charles-zablit

lldb/CMakeLists.txt

@@ -87,9 +87,11 @@ if (LLDB_ENABLE_PYTHON)
       set(LLDB_PYTHON_EXT_SUFFIX "_d${LLDB_PYTHON_EXT_SUFFIX}")
     endif()
   endif()
-  get_target_property(_Python3_LIB_PATH Python3::Python IMPORTED_LIBRARY_LOCATION)
-  if(_Python3_LIB_PATH)
-    get_filename_component(LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME "${_Python3_LIB_PATH}" NAME)
+  if(TARGET Python3::Python)
+    get_target_property(_Python3_LIB_PATH Python3::Python IMPORTED_LIBRARY_LOCATION)
+    if(_Python3_LIB_PATH)
+      get_filename_component(LLDB_PYTHON_RUNTIME_LIBRARY_FILENAME "${_Python3_LIB_PATH}" NAME)
+    endif()
   endif()
 endif ()
 

lldb/tools/driver/Driver.cpp

@@ -455,9 +455,8 @@ inline std::wstring GetPathToExecutableW() {
 /// `false` otherwise.
 bool AddPythonDLLToSearchPath() {
   std::wstring modulePath = GetPathToExecutableW();
-  if (modulePath.empty()) {
+  if (modulePath.empty())
     return false;
-  }
 
   SmallVector<char, MAX_PATH> utf8Path;
   if (sys::windows::UTF16ToUTF8(modulePath.c_str(), modulePath.length(),
@@ -501,8 +500,8 @@ void SetupPythonRuntimeLibrary() {
   if (AddPythonDLLToSearchPath())
     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())