From 833df9a3db2cc8a2a746c33aa9ebccad24c56fe0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 12 Jun 2016 16:27:27 +0000 Subject: [PATCH] Followup to fix the cmake install (Closes: #819072) --- debian/changelog | 3 +++ debian/rules | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3648bac2..f8494ffe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ llvm-toolchain-3.8 (1:3.8.1~+rc1-1~exp2) UNRELEASED; urgency=medium * debian/rules: Ensure ld-gold is used. CMake invokes the linker through g++ most of the time, therefore we need to set -Wl,-fuse-ld=gold. + [ Brad King ] + * Followup to fix the cmake install (Closes: #819072) + -- Sylvestre Ledru Sat, 11 Jun 2016 16:53:04 +0200 llvm-toolchain-3.8 (1:3.8.1~+rc1-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index de8a9656..bc784aae 100755 --- a/debian/rules +++ b/debian/rules @@ -412,6 +412,9 @@ endif # Change CMake module dir sed -i 's|LLVM_CMAKE_DIR "/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake"|LLVM_CMAKE_DIR "/usr/share/llvm-$(LLVM_VERSION)/cmake"|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake/LLVMConfig.cmake +# Disable CMake's package validation checks for target files that we may remove. + sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake/LLVMExports-*.cmake + # Managed in python-lldb-X.Y.links.in rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/_lldb.so