From e0eb35872929a796d63f0feb308a0bd5e4dfbd7b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 24 Aug 2016 21:20:58 +0000 Subject: [PATCH] remove compiler-rt-path.diff (file removed upstream, probably because we moved to cmake) --- debian/changelog | 2 ++ debian/patches/compiler-rt-path.diff | 13 ------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 debian/patches/compiler-rt-path.diff diff --git a/debian/changelog b/debian/changelog index 6c526a59..f6e022ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ llvm-toolchain-snapshot (1:4.0~svn275971-1~exp1) experimental; urgency=medium * Remove some garbage from the manpages (Closes: #815991, #804347) * Disable -gsplit-dwarf on Ubuntu precise * Update the coverity configuration (Debian has moved to gcc 6) + * remove compiler-rt-path.diff (file removed upstream, probably because + we moved to cmake) -- Sylvestre Ledru Mon, 25 Jul 2016 12:19:52 +0200 diff --git a/debian/patches/compiler-rt-path.diff b/debian/patches/compiler-rt-path.diff deleted file mode 100644 index e24268f2..00000000 --- a/debian/patches/compiler-rt-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot-3.5~svn208979/compiler-rt/make/platform/clang_linux.mk -=================================================================== ---- llvm-toolchain-snapshot-3.5~svn208979.orig/compiler-rt/make/platform/clang_linux.mk 2014-05-16 19:13:05.702922367 +0200 -+++ llvm-toolchain-snapshot-3.5~svn208979/compiler-rt/make/platform/clang_linux.mk 2014-05-16 19:13:27.551329647 +0200 -@@ -11,7 +11,7 @@ - # cross compilers). For now, we just find the target architecture of the - # compiler and only define configurations we know that compiler can generate. - CompilerTargetTriple := $(shell \ -- LANG=C $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2) -+ LD_LIBRARY_PATH=../build-llvm/Release/lib LANG=C $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2) - ifeq ($(CompilerTargetTriple),) - $(error "unable to infer compiler target triple for $(CC)") - endif diff --git a/debian/patches/series b/debian/patches/series index 50bc3203..224c11c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,7 +19,6 @@ do-not-fail-on-unexpected-pass.diff silent-more-tests.diff disable-display-PASS-UNSUPPORTED-XFAIL.diff fix-llvm-config-obj-src-root.patch -compiler-rt-path.diff 0044-soname.diff lldb-soname.diff lldb-libname.diff