diff --git a/debian/changelog b/debian/changelog index 13711e9d..32486d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-snapshot (1:3.9~svn260851-2) UNRELEASED; urgency=medium * Fix the coverage builds (didn't allow several cflags) * Set the correct conflicts on python-lldb-3.8 (Closes: #817873) * Set the correct conflicts on python-clang-3.8 (Closes: #817872) + * remove llvm26003-sanitizer-check-env.diff (merged upstream) -- Sylvestre Ledru Wed, 09 Mar 2016 19:30:30 +0100 diff --git a/debian/patches/llvm26003-sanitizer-check-env.diff b/debian/patches/llvm26003-sanitizer-check-env.diff deleted file mode 100644 index 9a121e3f..00000000 --- a/debian/patches/llvm26003-sanitizer-check-env.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compiler-rt/cmake/Modules/SanitizerUtils.cmake -+++ b/compiler-rt/cmake/Modules/SanitizerUtils.cmake -@@ -86,7 +86,7 @@ - # Add target to check code style for sanitizer runtimes. - if(UNIX) - add_custom_target(SanitizerLintCheck -- COMMAND LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 TMPDIR= -+ COMMAND env LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 TMPDIR= - PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} - COMPILER_RT=${COMPILER_RT_SOURCE_DIR} - ${SANITIZER_LINT_SCRIPT} diff --git a/debian/patches/series b/debian/patches/series index 4444b9de..561718fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,5 +25,4 @@ hurd-EIEIO-undef.diff silent-MCJIIT-tests.diff clang-analyzer-force-version.diff llvm25468-lldb-swig-format-security.diff -llvm26003-sanitizer-check-env.diff silent-test-transforms.diff