https://github.com/bulbazord updated https://github.com/llvm/llvm-project/pull/174658
>From 0342a42a8a66a6f0bc18876398f3364ca264261e Mon Sep 17 00:00:00 2001 From: Alex Langford <[email protected]> Date: Tue, 6 Jan 2026 13:52:41 -0800 Subject: [PATCH 1/2] [lldb] Repair lldb-dotest's framework path 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. --- lldb/utils/lldb-dotest/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index f3f75015637f4..c6077fad3b918 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -30,6 +30,7 @@ if ("libcxx" IN_LIST LLVM_ENABLE_RUNTIMES) endif() set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}") +set(LLDB_FRAMEWORK_DIR "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework") set(vars LLDB_TEST_COMMON_ARGS LLDB_TEST_USER_ARGS >From 3602de2221702136d8a71f21cb42a459ee25e61b Mon Sep 17 00:00:00 2001 From: Alex Langford <[email protected]> Date: Wed, 7 Jan 2026 11:31:03 -0800 Subject: [PATCH 2/2] hoist definition --- lldb/cmake/modules/LLDBConfig.cmake | 1 + lldb/test/API/CMakeLists.txt | 4 ---- lldb/utils/lldb-dotest/CMakeLists.txt | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) 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) diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index c6077fad3b918..f3f75015637f4 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -30,7 +30,6 @@ if ("libcxx" IN_LIST LLVM_ENABLE_RUNTIMES) endif() set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}") -set(LLDB_FRAMEWORK_DIR "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework") set(vars LLDB_TEST_COMMON_ARGS LLDB_TEST_USER_ARGS _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
