From 596883863d6ac0f3faffc13f45074817d4338267 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Jan 2023 19:38:42 +0100 Subject: [PATCH] rebase of the patches --- debian/patches/clangd-atomic-cmake.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch index d0a38279..dd7488cd 100644 --- a/debian/patches/clangd-atomic-cmake.patch +++ b/debian/patches/clangd-atomic-cmake.patch @@ -1,10 +1,10 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/clangd/CMakeLists.txt +Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/clangd/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/clangd/CMakeLists.txt -@@ -52,6 +52,11 @@ endif() - +--- llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9.orig/clang-tools-extra/clangd/CMakeLists.txt ++++ llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt +@@ -61,6 +61,11 @@ endif() include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy") + include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include") +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR + CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") @@ -14,11 +14,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extr add_clang_library(clangDaemon AST.cpp ASTSignals.cpp -@@ -166,6 +171,7 @@ clang_target_link_libraries(clangDaemon +@@ -177,6 +182,7 @@ clang_target_link_libraries(clangDaemon target_link_libraries(clangDaemon PRIVATE ${LLVM_PTHREAD_LIB} + ${CLANGD_ATOMIC_LIB} - clangTidy - + clangIncludeCleaner + clangPseudo