|
 |
1046448 |
From 6888de118707e6392b46073fc35738804f9f1d80 Mon Sep 17 00:00:00 2001
|
|
|
1046448 |
From: Alex Langford <alangford@apple.com>
|
|
|
1046448 |
Date: Mon, 31 Jul 2023 16:30:17 -0700
|
|
|
1046448 |
Subject: [PATCH] [lldb] Fix building LLDB standlone without framework
|
|
|
1046448 |
|
|
|
1046448 |
In a809720102fae8d1b5a7073f99f9dae9395c5f41 I refactored some logic to
|
|
|
1046448 |
deal with the clang resource directory in standalone LLDB builds.
|
|
|
1046448 |
However, this logic escaped me because it only runs when you do not
|
|
|
1046448 |
build LLDB.framework.
|
|
|
1046448 |
|
|
|
1046448 |
Differential Revision: https://reviews.llvm.org/D156763
|
|
|
1046448 |
---
|
|
|
1046448 |
lldb/source/API/CMakeLists.txt | 10 ++++------
|
|
|
1046448 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
1046448 |
|
|
|
1046448 |
diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt
|
|
|
1046448 |
index a55754726c58..39ac451c471c 100644
|
|
|
1046448 |
--- a/lldb/source/API/CMakeLists.txt
|
|
|
1046448 |
+++ b/lldb/source/API/CMakeLists.txt
|
|
|
1046448 |
@@ -204,13 +204,11 @@ else()
|
|
|
1046448 |
# When building the LLDB framework, this isn't necessary as there we copy everything we need into
|
|
|
1046448 |
# the framework (including the Clang resourece directory).
|
|
|
1046448 |
if(NOT LLDB_BUILD_FRAMEWORK)
|
|
|
1046448 |
- set(LLDB_CLANG_RESOURCE_DIR_PARENT "$<TARGET_FILE_DIR:liblldb>/clang")
|
|
|
1046448 |
- file(MAKE_DIRECTORY "${LLDB_CLANG_RESOURCE_DIR_PARENT}")
|
|
|
1046448 |
+ set(LLDB_CLANG_RESOURCE_DIR "$<TARGET_FILE_DIR:liblldb>/clang")
|
|
|
1046448 |
add_custom_command(TARGET liblldb POST_BUILD
|
|
|
1046448 |
- COMMENT "Linking Clang resource dir into LLDB build directory: ${LLDB_CLANG_RESOURCE_DIR_PARENT}"
|
|
|
1046448 |
- COMMAND ${CMAKE_COMMAND} -E make_directory "${LLDB_CLANG_RESOURCE_DIR_PARENT}"
|
|
|
1046448 |
- COMMAND ${CMAKE_COMMAND} -E create_symlink "${LLDB_EXTERNAL_CLANG_RESOURCE_DIR}"
|
|
|
1046448 |
- "${LLDB_CLANG_RESOURCE_DIR_PARENT}/${LLDB_CLANG_RESOURCE_DIR_NAME}"
|
|
|
1046448 |
+ COMMENT "Linking Clang resource dir into LLDB build directory: ${LLDB_CLANG_RESOURCE_DIR}"
|
|
|
1046448 |
+ COMMAND ${CMAKE_COMMAND} -E create_symlink
|
|
|
1046448 |
+ "${LLDB_EXTERNAL_CLANG_RESOURCE_DIR}" "${LLDB_CLANG_RESOURCE_DIR}"
|
|
|
1046448 |
)
|
|
|
1046448 |
endif()
|
|
|
1046448 |
endif()
|
|
|
1046448 |
--
|
|
|
1046448 |
2.41.0
|
|
|
1046448 |
|