Skip to content

Commit ee80b2e

Browse files
committed
[lldb][CMake] Update for swift-syntax FetchContent changes
Rename SWIFT_SWIFT_PARSER with SWIFT_BUILD_SWIFT_SYNTAX (cherry picked from commit 68b541d)
1 parent d3d9ccb commit ee80b2e

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
@@ -62,21 +62,6 @@ if (LLDB_ENABLE_SWIFT_SUPPORT)
6262
endif()
6363
endif()
6464

65-
# When we have the early SwiftSyntax build, we can include its parser.
66-
if (LLDB_ENABLE_SWIFT_SUPPORT)
67-
if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
68-
set(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS
69-
${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/cmake/SwiftSyntaxTargets.cmake)
70-
if(NOT EXISTS "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS}")
71-
message(STATUS "Skipping Swift Swift parser integration due to missing early SwiftSyntax")
72-
else()
73-
set(SWIFT_SWIFT_PARSER TRUE)
74-
include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
75-
endif()
76-
endif()
77-
endif()
78-
# END - Swift Mods
79-
8065
# Define the LLDB_CONFIGURATION_xxx matching the build type.
8166
if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
8267
add_definitions(-DLLDB_CONFIGURATION_DEBUG)

lldb/cmake/modules/AddLLDB.cmake

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

193193
if (NOT BOOTSTRAPPING_MODE)
194-
if (SWIFT_SWIFT_PARSER)
194+
if (SWIFT_BUILD_SWIFT_SYNTAX)
195195
set(APSM_BOOTSTRAPPING_MODE "HOSTTOOLS")
196196
endif()
197197
else()
@@ -238,7 +238,7 @@ function(add_properties_for_swift_modules target reldir)
238238
endif()
239239
endif()
240240

241-
if (SWIFT_SWIFT_PARSER)
241+
if (SWIFT_BUILD_SWIFT_SYNTAX)
242242
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
243243
set_property(TARGET ${target}
244244
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
@@ -70,7 +70,7 @@ target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source")
7070
target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})
7171

7272
# BEGIN Swift Mods
73-
if(SWIFT_SWIFT_PARSER)
73+
if(SWIFT_BUILD_SWIFT_SYNTAX)
7474
add_properties_for_swift_modules(lldb-server "../")
7575
endif()
7676
# END Swift Mods

lldb/unittests/CMakeLists.txt

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

3838
# BEGIN Swift Mods
39-
if(SWIFT_SWIFT_PARSER)
39+
if(SWIFT_BUILD_SWIFT_SYNTAX)
4040
add_properties_for_swift_modules(${test_name} "../")
4141
endif()
4242
# END Swift Mods

0 commit comments

Comments
 (0)