Skip to content

[5.10][lldb][CMake] Update for swift-syntax FetchContent changes #7549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2023
Merged

[5.10][lldb][CMake] Update for swift-syntax FetchContent changes #7549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions lldb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,6 @@ if (LLDB_ENABLE_SWIFT_SUPPORT)
endif()
endif()

# When we have the early SwiftSyntax build, we can include its parser.
if (LLDB_ENABLE_SWIFT_SUPPORT)
if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
set(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS
${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/cmake/SwiftSyntaxTargets.cmake)
if(NOT EXISTS "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS}")
message(STATUS "Skipping Swift Swift parser integration due to missing early SwiftSyntax")
else()
set(SWIFT_SWIFT_PARSER TRUE)
include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
endif()
endif()
endif()
# END - Swift Mods

# Define the LLDB_CONFIGURATION_xxx matching the build type.
if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
add_definitions(-DLLDB_CONFIGURATION_DEBUG)
Expand Down
4 changes: 2 additions & 2 deletions lldb/cmake/modules/AddLLDB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function(add_properties_for_swift_modules target reldir)
endif()

if (NOT BOOTSTRAPPING_MODE)
if (SWIFT_SWIFT_PARSER)
if (SWIFT_BUILD_SWIFT_SYNTAX)
set(APSM_BOOTSTRAPPING_MODE "HOSTTOOLS")
endif()
else()
Expand Down Expand Up @@ -206,7 +206,7 @@ function(add_properties_for_swift_modules target reldir)
${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/Windows/x86_64)
endif()

if (SWIFT_SWIFT_PARSER)
if (SWIFT_BUILD_SWIFT_SYNTAX)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
set_property(TARGET ${target}
APPEND PROPERTY BUILD_RPATH "@loader_path/${build_reldir}lib/swift/host")
Expand Down
2 changes: 1 addition & 1 deletion lldb/tools/lldb-server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source")
target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})

# BEGIN Swift Mods
if(SWIFT_SWIFT_PARSER)
if(SWIFT_BUILD_SWIFT_SYNTAX)
add_properties_for_swift_modules(lldb-server "../")
endif()
# END Swift Mods
2 changes: 1 addition & 1 deletion lldb/unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function(add_lldb_unittest test_name)
target_link_libraries(${test_name} PRIVATE ${ARG_LINK_LIBS})

# BEGIN Swift Mods
if(SWIFT_SWIFT_PARSER)
if(SWIFT_BUILD_SWIFT_SYNTAX)
add_properties_for_swift_modules(${test_name} "../")
endif()
# END Swift Mods
Expand Down