Author: Alex Langford Date: 2026-01-08T11:06:11-08:00 New Revision: 55e508c1339d0bb33b8012e16b93b7ae3a53a419
URL: https://github.com/llvm/llvm-project/commit/55e508c1339d0bb33b8012e16b93b7ae3a53a419 DIFF: https://github.com/llvm/llvm-project/commit/55e508c1339d0bb33b8012e16b93b7ae3a53a419.diff LOG: [lldb] Repair lldb-dotest's framework path (#174658) lldb-dotest was likely getting LLDB_FRAMEWORK_DIR from another place before. Now it's undefined when lldb-dotest is configured, so it's an empty string. Some API tests will fail to link against LLDB. Added: Modified: lldb/cmake/modules/LLDBConfig.cmake lldb/test/API/CMakeLists.txt Removed: ################################################################################ diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index 0d62c325da91c..d4471b8a5418d 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -99,6 +99,7 @@ if(LLDB_BUILD_FRAMEWORK) get_filename_component(LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR ${LLDB_FRAMEWORK_BUILD_DIR} ABSOLUTE BASE_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}) + set(LLDB_FRAMEWORK_DIR "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework") # Essentially, emit the framework's dSYM outside of the framework directory. set(LLDB_DEBUGINFO_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin CACHE STRING diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt index c719ac3382a67..d952bd3201624 100644 --- a/lldb/test/API/CMakeLists.txt +++ b/lldb/test/API/CMakeLists.txt @@ -124,10 +124,6 @@ if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "") endif() if(CMAKE_HOST_APPLE) - if(LLDB_BUILD_FRAMEWORK) - set(LLDB_FRAMEWORK_DIR ${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework) - endif() - if(LLDB_USE_SYSTEM_DEBUGSERVER) lldb_find_system_debugserver(system_debugserver_path) if(LLDB_BUILD_FRAMEWORK) _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
