Skip to content

Commit 5ed6d99

Browse files
committed
[lldb] Remove legacy six module for py2->py3
LLDB only supports Python3 now, so the `six` shim for Python2 is no longer necessary. Reviewed By: JDevlieghere Differential Revision: https://reviews.llvm.org/D142140
1 parent 5dd7c16 commit 5ed6d99

File tree

4 files changed

+0
-913
lines changed

4 files changed

+0
-913
lines changed

lldb/bindings/python/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
6060
DEPENDS ${lldb_python_bindings_dir}/lldb.py
6161
COMMENT "Python script sym-linking LLDB Python API")
6262

63-
if(NOT LLDB_USE_SYSTEM_SIX)
64-
add_custom_command(TARGET ${swig_target} POST_BUILD VERBATIM
65-
COMMAND ${CMAKE_COMMAND} -E copy
66-
"${LLDB_SOURCE_DIR}/third_party/Python/module/six/six.py"
67-
"${lldb_python_target_dir}/../six.py")
68-
endif()
69-
7063
add_custom_command(TARGET ${swig_target} POST_BUILD VERBATIM
7164
COMMAND ${CMAKE_COMMAND} -E copy
7265
"${lldb_python_bindings_dir}/lldb.py"

lldb/cmake/modules/LLDBConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ add_optional_dependency(LLDB_ENABLE_PYTHON "Enable Python scripting support in L
6565
add_optional_dependency(LLDB_ENABLE_LIBXML2 "Enable Libxml 2 support in LLDB" LibXml2 LIBXML2_FOUND VERSION 2.8)
6666
add_optional_dependency(LLDB_ENABLE_FBSDVMCORE "Enable libfbsdvmcore support in LLDB" FBSDVMCore FBSDVMCore_FOUND QUIET)
6767

68-
option(LLDB_USE_SYSTEM_SIX "Use six.py shipped with system and do not install a copy of it" OFF)
6968
option(LLDB_USE_ENTITLEMENTS "When codesigning, use entitlements if available" ON)
7069
option(LLDB_BUILD_FRAMEWORK "Build LLDB.framework (Darwin only)" OFF)
7170
option(LLDB_NO_INSTALL_DEFAULT_RPATH "Disable default RPATH settings in binaries" OFF)

lldb/third_party/Python/module/six/LICENSE

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)