Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 89d0c85

Browse files
chelcassanovaJDevlieghere
authored andcommitted
[lldb][rpc] Disable building lldb-rpc-gen tool (llvm#150699)
Disabling the lldb-rpc-gen tool while issues with certain builds are solved: llvm#148996 (cherry picked from commit 67b5195)
1 parent 7c1700b commit 89d0c85

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

lldb/cmake/modules/LLDBConfig.cmake

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@ endif()
384384
# lldb-rpc sources in the first phase of host build so that they can
385385
# get built using the just-built Clang toolchain in the second phase.
386386
if (NOT DEFINED LLDB_CAN_USE_LLDB_RPC_SERVER)
387+
set(LLDB_CAN_USE_LLDB_RPC_SERVER OFF)
388+
else()
387389
if ((CMAKE_CROSSCOMPILING OR LLVM_HOST_TRIPLE MATCHES "${LLVM_DEFAULT_TARGET_TRIPLE}") AND
388390
CMAKE_SYSTEM_NAME MATCHES "AIX|Android|Darwin|FreeBSD|Linux|NetBSD|OpenBSD|Windows")
389391
set(LLDB_CAN_USE_LLDB_RPC_SERVER ON)
@@ -392,11 +394,16 @@ if (NOT DEFINED LLDB_CAN_USE_LLDB_RPC_SERVER)
392394
endif()
393395
endif()
394396

395-
if (CMAKE_CROSSCOMPILING)
396-
set(LLDB_BUILD_LLDBRPC OFF CACHE BOOL "")
397-
get_host_tool_path(lldb-rpc-gen LLDB_RPC_GEN_EXE lldb_rpc_gen_exe lldb_rpc_gen_target)
397+
398+
if (NOT DEFINED LLDB_BUILD_LLDBRPC)
399+
set(LLDB_BUILD_LLDBRPC OFF)
398400
else()
399-
set(LLDB_BUILD_LLDBRPC ON CACHE BOOL "")
401+
if (CMAKE_CROSSCOMPILING)
402+
set(LLDB_BUILD_LLDBRPC OFF CACHE BOOL "")
403+
get_host_tool_path(lldb-rpc-gen LLDB_RPC_GEN_EXE lldb_rpc_gen_exe lldb_rpc_gen_target)
404+
else()
405+
set(LLDB_BUILD_LLDBRPC ON CACHE BOOL "")
406+
endif()
400407
endif()
401408

402409
include(LLDBGenerateConfig)

0 commit comments

Comments
 (0)