Skip to content

Commit 3de9301

Browse files
[clangd] Add a build option to disable building dexp (llvm#133124)
Building dexp on Debian 11 currently causes intermittent failures [0] [1]. Adding the CLANGD_BUILD_DEXP option to disable dexp from the build allows Debian 11 users to build clang (albeit without the dexp tool). This option is set to "Build Dexp" by default so, no change is expected without manual setting. [0]: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15803 [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1101322
1 parent 99df442 commit 3de9301

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

clang-tools-extra/clangd/CMakeLists.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ if (CLANGD_ENABLE_REMOTE)
210210
include(AddGRPC)
211211
endif()
212212

213+
option(CLANGD_BUILD_DEXP "Build the dexp tool as part of Clangd" ON)
214+
llvm_canonicalize_cmake_booleans(CLANGD_BUILD_DEXP)
215+
213216
if(CLANG_INCLUDE_TESTS)
214217
add_subdirectory(test)
215218
add_subdirectory(unittests)
@@ -220,4 +223,7 @@ option(CLANGD_ENABLE_REMOTE "Use gRPC library to enable remote index support for
220223
set(GRPC_INSTALL_PATH "" CACHE PATH "Path to gRPC library manual installation.")
221224

222225
add_subdirectory(index/remote)
223-
add_subdirectory(index/dex/dexp)
226+
227+
if(CLANGD_BUILD_DEXP)
228+
add_subdirectory(index/dex/dexp)
229+
endif()

clang-tools-extra/clangd/test/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ set(CLANGD_TEST_DEPS
33
ClangdTests
44
clangd-indexer
55
split-file
6-
# No tests for it, but we should still make sure they build.
7-
dexp
86
)
97

108
if(CLANGD_BUILD_XPC)
119
list(APPEND CLANGD_TEST_DEPS clangd-xpc-test-client)
1210
list(APPEND CLANGD_TEST_DEPS ClangdXpcUnitTests)
1311
endif()
1412

13+
if(CLANGD_BUILD_DEXP)
14+
# No tests for it, but we should still make sure they build.
15+
list(APPEND CLANGD_TEST_DEPS dexp)
16+
endif()
17+
1518
if(CLANGD_ENABLE_REMOTE)
1619
list(APPEND CLANGD_TEST_DEPS clangd-index-server clangd-index-server-monitor)
1720
endif()

clang-tools-extra/clangd/test/lit.site.cfg.py.in

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ config.llvm_shlib_dir = "@SHLIBDIR@"
1515
config.clangd_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.."
1616
config.clangd_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.."
1717
config.clangd_build_xpc = @CLANGD_BUILD_XPC@
18+
config.clangd_build_dexp = @CLANGD_BUILD_DEXP@
1819
config.clangd_enable_remote = @CLANGD_ENABLE_REMOTE@
1920
config.clangd_tidy_checks = @CLANGD_TIDY_CHECKS@
2021
config.have_zlib = @LLVM_ENABLE_ZLIB@

0 commit comments

Comments
 (0)