From 05ad419a358e0a920a0fe99edde2bd66b25e8ae6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 26 Aug 2019 20:41:53 +0200 Subject: [PATCH] revert temp workaround --- debian/changelog | 1 - .../revert-369823-compiler-rt-gwp-asan.diff | 17 ----------------- debian/patches/series | 1 - 3 files changed, 19 deletions(-) delete mode 100644 debian/patches/revert-369823-compiler-rt-gwp-asan.diff diff --git a/debian/changelog b/debian/changelog index fab81d3d..cc4138d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ llvm-toolchain-snapshot (1:10~svn368740-1~exp2) experimental; urgency=medium * Workaround bug https://bugs.llvm.org/show_bug.cgi?id=42994 (fails to link on Debian buster) * for Ubuntu xenial: pass PYTHON_EXE to the stage2 build - * Revert 369823. See https://reviews.llvm.org/D66682#1644286 -- Sylvestre Ledru Wed, 14 Aug 2019 13:21:54 +0200 diff --git a/debian/patches/revert-369823-compiler-rt-gwp-asan.diff b/debian/patches/revert-369823-compiler-rt-gwp-asan.diff deleted file mode 100644 index 16b33ba8..00000000 --- a/debian/patches/revert-369823-compiler-rt-gwp-asan.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: llvm-toolchain-snapshot_10~svn369866/compiler-rt/lib/gwp_asan/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~svn369866.orig/compiler-rt/lib/gwp_asan/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~svn369866/compiler-rt/lib/gwp_asan/CMakeLists.txt -@@ -105,9 +105,9 @@ if (COMPILER_RT_HAS_GWP_ASAN) - # core is to link it against a dummy main when DLLVM_USE_SANITIZE_COVERAGE - # isn't specified. Instead, here we only build fuzz targets if clang version - # is >= 6.0. -- if (COMPILER_RT_BUILD_LIBFUZZER AND -- "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND -- CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0) -+ if (COMPILER_RT_BUILD_LIBFUZZER AND -+ ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND -+ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0) - add_executable(stack_trace_compressor_fuzzer - stack_trace_compressor_fuzzer.cpp - ${GWP_ASAN_SOURCES} diff --git a/debian/patches/series b/debian/patches/series index 3d93c661..f483750c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -130,4 +130,3 @@ clang-riscv64-multiarch.diff # Compiler-rt - workaround workaround-bug-42994-use-linker.diff -revert-369823-compiler-rt-gwp-asan.diff