1 files changed, 7 insertions, 10 deletions
diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt
index cd5730f1b5b..93ed716e5f1 100644
--- a/lldb/source/CMakeLists.txt
+++ b/lldb/source/CMakeLists.txt
@@ -43,29 +43,26 @@ include(../cmake/LLDBDependencies.cmake)
 add_lldb_library(liblldb SHARED
   lldb.cpp
   lldb-log.cpp
+  $<TARGET_OBJECTS:lldbAPI>
   ${LLDB_WRAP_PYTHON}
   ${LLDB_VERS_GENERATED_FILE}
   )
 
+set_target_properties(liblldb
+  PROPERTIES
+  VERSION ${LLDB_VERSION}
+  )
 
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
-  target_link_libraries(liblldb PRIVATE lldbAPI)
-  # Only MSVC has the ABI compatibility and avoids using FindPythonLibs,
+  # Only MSVC has the ABI compatibility problem and avoids using FindPythonLibs,
   # so only it needs to explicitly link against ${PYTHON_LIBRARY}
-  if (MSVC)
+  if (MSVC AND NOT LLDB_DISABLE_PYTHON)
     target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
   endif()
-
-  set_target_properties(liblldb
-    PROPERTIES
-    OUTPUT_NAME liblldb
-    VERSION ${LLDB_VERSION}
-    )
 else()
   set_target_properties(liblldb
     PROPERTIES
     OUTPUT_NAME lldb
-    VERSION ${LLDB_VERSION}
     )
 endif()