Merge remote-tracking branch 'origin/15' into snapshot

This commit is contained in:
Sylvestre Ledru 2022-10-14 19:36:10 +02:00
commit bfd97d1fe2
2 changed files with 3 additions and 3 deletions

2
debian/changelog vendored
View File

@ -43,7 +43,7 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental
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 <sylvestre@debian.org> Wed, 12 Oct 2022 16:19:03 +0200

4
debian/rules vendored
View File

@ -980,8 +980,8 @@ endif
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_TARGETS mlir-tblgen/ {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