From fb2ed040d94054e40eb5606d5a8fade97d395e07 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 15 Nov 2019 22:41:25 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/D67877.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/D67877.patch b/debian/patches/D67877.patch index 9b96ed5b..8a844108 100644 --- a/debian/patches/D67877.patch +++ b/debian/patches/D67877.patch @@ -1,20 +1,20 @@ Origin: https://reviews.llvm.org/D67877 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941082 -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Analysis/plugins/CMakeLists.txt +Index: llvm-toolchain-snapshot_10~+20191115103341+caf3166d40f/clang/lib/Analysis/plugins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Analysis/plugins/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Analysis/plugins/CMakeLists.txt +--- llvm-toolchain-snapshot_10~+20191115103341+caf3166d40f.orig/clang/lib/Analysis/plugins/CMakeLists.txt ++++ llvm-toolchain-snapshot_10~+20191115103341+caf3166d40f/clang/lib/Analysis/plugins/CMakeLists.txt @@ -1,4 +1,4 @@ -if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS) +if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS AND CLANG_BUILD_EXAMPLES) add_subdirectory(SampleAnalyzer) add_subdirectory(CheckerDependencyHandling) add_subdirectory(CheckerOptionHandling) -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/test/CMakeLists.txt +Index: llvm-toolchain-snapshot_10~+20191115103341+caf3166d40f/clang/test/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/test/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/test/CMakeLists.txt +--- llvm-toolchain-snapshot_10~+20191115103341+caf3166d40f.orig/clang/test/CMakeLists.txt ++++ llvm-toolchain-snapshot_10~+20191115103341+caf3166d40f/clang/test/CMakeLists.txt @@ -126,14 +126,12 @@ if( NOT CLANG_BUILT_STANDALONE ) endif() endif() @@ -35,4 +35,4 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/test/CMakeLi + ) endif() - add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS}) + # Copy gen_ast_dump_json_test.py to the clang build dir. This allows invoking