Skip to content

[lldb][rpc] Fix build failures when building lldb-rpc-gen #151603

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[lldb][rpc] Fix build failures when building lldb-rpc-gen #151603

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
23 changes: 8 additions & 15 deletions lldb/cmake/modules/LLDBConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,30 +323,23 @@ else()
set(LLDB_CAN_USE_DEBUGSERVER OFF)
endif()

# In a cross-compile build, we need to skip building the generated
# lldb-rpc sources in the first phase of host build so that they can
# get built using the just-built Clang toolchain in the second phase.
if (NOT DEFINED LLDB_CAN_USE_LLDB_RPC_SERVER)
set(LLDB_CAN_USE_LLDB_RPC_SERVER OFF)
else()
if ((CMAKE_CROSSCOMPILING OR LLVM_HOST_TRIPLE MATCHES "${LLVM_DEFAULT_TARGET_TRIPLE}") AND
# In a cross-compile build, we don't want to try to build a lldb-rpc-gen, as
# as that essentially forces rebuilding a whole separate native copy of clang.
# Allow the caller to set this variable manually to opt in/out of it.
if (NOT CMAKE_CROSSCOMPILING AND
CMAKE_SYSTEM_NAME MATCHES "AIX|Android|Darwin|FreeBSD|Linux|NetBSD|OpenBSD|Windows")
set(LLDB_CAN_USE_LLDB_RPC_SERVER ON)
else()
set(LLDB_CAN_USE_LLDB_RPC_SERVER OFF)
endif()
endif()


if (NOT DEFINED LLDB_BUILD_LLDBRPC)
set(LLDB_BUILD_LLDBRPC OFF)
if (CMAKE_CROSSCOMPILING)
set(LLDB_BUILD_LLDBRPC OFF CACHE BOOL "")
get_host_tool_path(lldb-rpc-gen LLDB_RPC_GEN_EXE lldb_rpc_gen_exe lldb_rpc_gen_target)
else()
if (CMAKE_CROSSCOMPILING)
set(LLDB_BUILD_LLDBRPC OFF CACHE BOOL "")
get_host_tool_path(lldb-rpc-gen LLDB_RPC_GEN_EXE lldb_rpc_gen_exe lldb_rpc_gen_target)
else()
set(LLDB_BUILD_LLDBRPC ON CACHE BOOL "")
endif()
set(LLDB_BUILD_LLDBRPC ON CACHE BOOL "")
endif()

include(LLDBGenerateConfig)
6 changes: 2 additions & 4 deletions lldb/tools/lldb-rpc-gen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@ add_lldb_tool(lldb-rpc-gen
LINK_COMPONENTS
Support
)

if (NOT DEFINED LLDB_RPC_GEN_EXE)
set(LLDB_RPC_GEN_EXE $<TARGET_FILE:lldb-rpc-gen> CACHE STRING "Executable that generates lldb-rpc-server")
endif()
add_dependencies(lldb-rpc-gen clang-resource-headers)
setup_host_tool(lldb-rpc-gen LLDB_RPC_GEN_EXE lldb_rpc_gen_exe lldb_rpc_gen_target)
4 changes: 2 additions & 2 deletions lldb/tools/lldb-rpc/LLDBRPCGeneration.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ add_custom_command(OUTPUT ${lldb_rpc_gen_byproducts}
COMMAND ${CMAKE_COMMAND} -E make_directory
${lldb_rpc_server_generated_source_dir}

COMMAND ${LLDB_RPC_GEN_EXE}
COMMAND ${lldb_rpc_gen_exe}
-p ${CMAKE_BINARY_DIR}
--output-dir=${lldb_rpc_generated_dir}
${sysroot_arg}
--extra-arg="-USWIG"
${api_headers}

DEPENDS ${LLDB_RPC_GEN_EXE} ${api_headers}
DEPENDS ${lldb_rpc_gen_exe} ${api_headers}
COMMENT "Generating sources for lldb-rpc-server..."
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
Expand Down
Loading