Skip to content

Commit 0e21831

Browse files
authored
Merge pull request #5815 from bulbazord/fix_swift_support_off
[lldb] Fix building stable/20220421 without swift support
2 parents cc3ed3b + cdc2a8f commit 0e21831

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

lldb/cmake/modules/LLDBConfig.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,13 @@ if(LLDB_BUILD_FRAMEWORK)
112112
set(LLDB_FRAMEWORK_VERSION A CACHE STRING "LLDB.framework version (default is A)")
113113
set(LLDB_FRAMEWORK_BUILD_DIR bin CACHE STRING "Output directory for LLDB.framework")
114114
set(LLDB_FRAMEWORK_INSTALL_DIR Library/Frameworks CACHE STRING "Install directory for LLDB.framework")
115-
set(LLDB_FRAMEWORK_COPY_SWIFT_RESOURCES 1 CACHE BOOL "Copy the Swift headers into the resource directory of the LLDB.framework")
115+
if (LLDB_ENABLE_SWIFT_SUPPORT)
116+
set(should_copy_swift_resources ON)
117+
else()
118+
set(should_copy_swift_resources OFF)
119+
endif()
120+
121+
set(LLDB_FRAMEWORK_COPY_SWIFT_RESOURCES ${should_copy_swift_resources} CACHE BOOL "Copy the Swift headers into the resource directory of the LLDB.framework")
116122

117123
get_filename_component(LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR ${LLDB_FRAMEWORK_BUILD_DIR} ABSOLUTE
118124
BASE_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR})

lldb/source/Host/macosx/objcxx/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ add_lldb_library(lldbHostMacOSXObjCXX
1111
Host.mm
1212
HostInfoMacOSX.mm
1313
HostThreadMacOSX.mm
14-
HostInfoMacOSXSwift.cpp
1514

1615
${SWIFT_SOURCES}
1716

0 commit comments

Comments
 (0)