From 992e52c0b156a5ba9c6a8a54f8c4857ddd3d371d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 14 Oct 2022 19:35:00 +0200 Subject: [PATCH] don't search for llvm-bolt & merge-fdata in cmake --- debian/changelog | 2 +- debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2dd4bd8e..8ca274ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ llvm-toolchain-15 (1:15.0.2-2~exp6) experimental; urgency=medium * Disable LTO for now - * don't search for llvm-bolt in cmake + * don't search for llvm-bolt & merge-fdata in cmake https://github.com/llvm/llvm-project/issues/58317 -- Sylvestre Ledru Wed, 12 Oct 2022 16:19:03 +0200 diff --git a/debian/rules b/debian/rules index 4c99a9d1..df0c1d4f 100755 --- a/debian/rules +++ b/debian/rules @@ -960,8 +960,8 @@ endif # Also disable mlir-* checks in the cmake sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake sed -i '/_IMPORT_CHECK_TARGETS tblgen-lsp-server/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake - sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|llvm-bolt\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|llvm-bolt\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|llvm-bolt\|merge-fdata\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_cmake_import_check_files_for_\(mlir\|llvm-bolt\|merge-fdata\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake