|
| 1 | +From 8001f900e602c0a8abcf118bda5869a2eb0d5ee9 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Yoann Congal < [email protected]> |
| 3 | +Date: Tue, 25 Mar 2025 22:25:55 +0100 |
| 4 | +Subject: [PATCH] clangd: Add a build option to disable building dexp |
| 5 | + |
| 6 | +Building dexp on Debian 11 currently causes intermittent failure[0][1]. |
| 7 | + |
| 8 | +Adding the CLANGD_BUILD_DEXP option to disable dexp from the build |
| 9 | +allows Debian 11 users to build clang (albeit without the dexp tool). |
| 10 | + |
| 11 | +This option is set to "Build Dexp" by default so, no change is expected |
| 12 | +without manual setting. |
| 13 | + |
| 14 | +[0]: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15803 |
| 15 | +[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1101322 |
| 16 | + |
| 17 | +Upstream-Status: Submitted [https://github.com/llvm/llvm-project/pull/133124] |
| 18 | +Signed-off-by: Yoann Congal < [email protected]> |
| 19 | +--- |
| 20 | + clang-tools-extra/clangd/CMakeLists.txt | 8 +++++++- |
| 21 | + clang-tools-extra/clangd/test/CMakeLists.txt | 7 +++++-- |
| 22 | + clang-tools-extra/clangd/test/lit.site.cfg.py.in | 1 + |
| 23 | + 3 files changed, 13 insertions(+), 3 deletions(-) |
| 24 | + |
| 25 | +diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt |
| 26 | +index 6f10afe4a562..a1e9da41b4b3 100644 |
| 27 | +--- a/clang-tools-extra/clangd/CMakeLists.txt |
| 28 | ++++ b/clang-tools-extra/clangd/CMakeLists.txt |
| 29 | +@@ -210,6 +210,9 @@ if (CLANGD_ENABLE_REMOTE) |
| 30 | + include(AddGRPC) |
| 31 | + endif() |
| 32 | + |
| 33 | ++option(CLANGD_BUILD_DEXP "Build the dexp tool as part of Clangd" ON) |
| 34 | ++llvm_canonicalize_cmake_booleans(CLANGD_BUILD_DEXP) |
| 35 | ++ |
| 36 | + if(CLANG_INCLUDE_TESTS) |
| 37 | + add_subdirectory(test) |
| 38 | + add_subdirectory(unittests) |
| 39 | +@@ -220,4 +223,7 @@ option(CLANGD_ENABLE_REMOTE "Use gRPC library to enable remote index support for |
| 40 | + set(GRPC_INSTALL_PATH "" CACHE PATH "Path to gRPC library manual installation.") |
| 41 | + |
| 42 | + add_subdirectory(index/remote) |
| 43 | +-add_subdirectory(index/dex/dexp) |
| 44 | ++ |
| 45 | ++if(CLANGD_BUILD_DEXP) |
| 46 | ++ add_subdirectory(index/dex/dexp) |
| 47 | ++endif() |
| 48 | +diff --git a/clang-tools-extra/clangd/test/CMakeLists.txt b/clang-tools-extra/clangd/test/CMakeLists.txt |
| 49 | +index b51f461a4986..42fc3506641f 100644 |
| 50 | +--- a/clang-tools-extra/clangd/test/CMakeLists.txt |
| 51 | ++++ b/clang-tools-extra/clangd/test/CMakeLists.txt |
| 52 | +@@ -3,8 +3,6 @@ set(CLANGD_TEST_DEPS |
| 53 | + ClangdTests |
| 54 | + clangd-indexer |
| 55 | + split-file |
| 56 | +- # No tests for it, but we should still make sure they build. |
| 57 | +- dexp |
| 58 | + ) |
| 59 | + |
| 60 | + if(CLANGD_BUILD_XPC) |
| 61 | +@@ -12,6 +10,11 @@ if(CLANGD_BUILD_XPC) |
| 62 | + list(APPEND CLANGD_TEST_DEPS ClangdXpcUnitTests) |
| 63 | + endif() |
| 64 | + |
| 65 | ++if(CLANGD_BUILD_DEXP) |
| 66 | ++ # No tests for it, but we should still make sure they build. |
| 67 | ++ list(APPEND CLANGD_TEST_DEPS dexp) |
| 68 | ++endif() |
| 69 | ++ |
| 70 | + if(CLANGD_ENABLE_REMOTE) |
| 71 | + list(APPEND CLANGD_TEST_DEPS clangd-index-server clangd-index-server-monitor) |
| 72 | + endif() |
| 73 | +diff --git a/clang-tools-extra/clangd/test/lit.site.cfg.py.in b/clang-tools-extra/clangd/test/lit.site.cfg.py.in |
| 74 | +index 1fe7c8d0f324..a0bb3561e19e 100644 |
| 75 | +--- a/clang-tools-extra/clangd/test/lit.site.cfg.py.in |
| 76 | ++++ b/clang-tools-extra/clangd/test/lit.site.cfg.py.in |
| 77 | +@@ -15,6 +15,7 @@ config.llvm_shlib_dir = "@SHLIBDIR@" |
| 78 | + config.clangd_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.." |
| 79 | + config.clangd_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.." |
| 80 | + config.clangd_build_xpc = @CLANGD_BUILD_XPC@ |
| 81 | ++config.clangd_build_dexp = @CLANGD_BUILD_DEXP@ |
| 82 | + config.clangd_enable_remote = @CLANGD_ENABLE_REMOTE@ |
| 83 | + config.clangd_tidy_checks = @CLANGD_TIDY_CHECKS@ |
| 84 | + config.have_zlib = @LLVM_ENABLE_ZLIB@ |
0 commit comments