Skip to content

Commit 68b541d

Browse files
committed
[lldb][CMake] Update for swift-syntax FetchContent changes
Rename SWIFT_SWIFT_PARSER with SWIFT_BUILD_SWIFT_SYNTAX
1 parent ab81227 commit 68b541d

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

lldb/CMakeLists.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,6 @@ if (LLDB_ENABLE_SWIFT_SUPPORT)
4949
endif()
5050
endif()
5151

52-
# When we have the early SwiftSyntax build, we can include its parser.
53-
if (LLDB_ENABLE_SWIFT_SUPPORT)
54-
if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
55-
set(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS
56-
${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/cmake/SwiftSyntaxTargets.cmake)
57-
if(NOT EXISTS "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS}")
58-
message(STATUS "Skipping Swift Swift parser integration due to missing early SwiftSyntax")
59-
else()
60-
set(SWIFT_SWIFT_PARSER TRUE)
61-
include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
62-
endif()
63-
endif()
64-
endif()
65-
# END - Swift Mods
66-
6752
# Define the LLDB_CONFIGURATION_xxx matching the build type.
6853
if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
6954
add_definitions(-DLLDB_CONFIGURATION_DEBUG)

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function(add_properties_for_swift_modules target reldir)
164164
endif()
165165

166166
if (NOT BOOTSTRAPPING_MODE)
167-
if (SWIFT_SWIFT_PARSER)
167+
if (SWIFT_BUILD_SWIFT_SYNTAX)
168168
set(APSM_BOOTSTRAPPING_MODE "HOSTTOOLS")
169169
endif()
170170
else()
@@ -211,7 +211,7 @@ function(add_properties_for_swift_modules target reldir)
211211
endif()
212212
endif()
213213

214-
if (SWIFT_SWIFT_PARSER)
214+
if (SWIFT_BUILD_SWIFT_SYNTAX)
215215
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
216216
set_property(TARGET ${target}
217217
APPEND PROPERTY BUILD_RPATH "@loader_path/${build_reldir}lib/swift/host")

lldb/tools/lldb-server/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source")
6969
target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})
7070

7171
# BEGIN Swift Mods
72-
if(SWIFT_SWIFT_PARSER)
72+
if(SWIFT_BUILD_SWIFT_SYNTAX)
7373
add_properties_for_swift_modules(lldb-server "../")
7474
endif()
7575
# END Swift Mods

lldb/unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function(add_lldb_unittest test_name)
4343
target_link_libraries(${test_name} PRIVATE ${ARG_LINK_LIBS})
4444

4545
# BEGIN Swift Mods
46-
if(SWIFT_SWIFT_PARSER)
46+
if(SWIFT_BUILD_SWIFT_SYNTAX)
4747
add_properties_for_swift_modules(${test_name} "../")
4848
endif()
4949
# END Swift Mods

0 commit comments

Comments
 (0)