Author: Daniel Thornburgh
Date: 2023-08-25T16:45:05-07:00
New Revision: 8456c8fe4e82e667e90beebb793c472bc0654a4c

URL: 
https://github.com/llvm/llvm-project/commit/8456c8fe4e82e667e90beebb793c472bc0654a4c
DIFF: 
https://github.com/llvm/llvm-project/commit/8456c8fe4e82e667e90beebb793c472bc0654a4c.diff

LOG: [CMake] Allow enabling Python in Fuchsia LLDB

Added: 
    

Modified: 
    clang/cmake/caches/Fuchsia-stage2.cmake
    clang/cmake/caches/Fuchsia.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/Fuchsia-stage2.cmake 
b/clang/cmake/caches/Fuchsia-stage2.cmake
index 42d7f36df3f93d..3283c551ccb7cf 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -355,12 +355,16 @@ set(_FUCHSIA_DISTRIBUTIONS Toolchain)
 if(FUCHSIA_ENABLE_LLDB)
   list(APPEND _FUCHSIA_ENABLE_PROJECTS lldb)
   list(APPEND _FUCHSIA_DISTRIBUTIONS Debugger)
-  set(LLVM_Debugger_DISTRIBUTION_COMPONENTS
+  set(_FUCHSIA_LLDB_COMPONENTS
     lldb
     liblldb
     lldb-server
     lldb-argdumper
-    CACHE STRING "")
+  )
+  if(LLDB_ENABLE_PYTHON)
+    list(APPEND _FUCHSIA_LLDB_COMPONENTS lldb-python-scripts)
+  endif()
+  set(LLVM_Debugger_DISTRIBUTION_COMPONENTS ${_FUCHSIA_LLDB_COMPONENTS} CACHE 
STRING "")
 endif()
 
 set(LLVM_DISTRIBUTIONS ${_FUCHSIA_DISTRIBUTIONS} CACHE STRING "")

diff  --git a/clang/cmake/caches/Fuchsia.cmake 
b/clang/cmake/caches/Fuchsia.cmake
index bbaf8e262b9250..c599f141f9e5b1 100644
--- a/clang/cmake/caches/Fuchsia.cmake
+++ b/clang/cmake/caches/Fuchsia.cmake
@@ -44,6 +44,14 @@ set(_FUCHSIA_BOOTSTRAP_PASSTHROUGH
   FUCHSIA_ENABLE_LLDB
   LLDB_ENABLE_CURSES
   LLDB_ENABLE_LIBEDIT
+  LLDB_ENABLE_PYTHON
+  LLDB_EMBED_PYTHON_HOME
+  LLDB_PYTHON_HOME
+  LLDB_PYTHON_RELATIVE_PATH
+  Python3_EXECUTABLE
+  Python3_LIBRARIES
+  Python3_INCLUDE_DIRS
+  Python3_RPATH
   CMAKE_FIND_PACKAGE_PREFER_CONFIG
   CMAKE_SYSROOT
   CMAKE_MODULE_LINKER_FLAGS


        
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to