diff --git a/debian/changelog b/debian/changelog index bf970bbf..042854ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-snapshot (1:14~++20220105112135+cdbad62c526c-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-13 (1:13.0.1-2) unstable; urgency=medium - * experimental New snapshot release - * experimental New snapshot release - * experimental New snapshot release + * mlir: use the cmake option to avoid installing object files + MLIR_INSTALL_AGGREGATE_OBJECTS + Closes upstream #53134 -- Sylvestre Ledru Wed, 05 Jan 2022 23:21:56 +0100 diff --git a/debian/rules b/debian/rules index 0eab5664..5d51b4ba 100755 --- a/debian/rules +++ b/debian/rules @@ -262,6 +262,10 @@ ifeq ($(LIBUNWIND_ENABLE),yes) endif endif +# Do not install objects +STAGE_ALL_CMAKE_EXTRA += -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF + + RUN_TEST=yes ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) RUN_TEST=no @@ -687,9 +691,6 @@ override_dh_auto_install: # Remove an example - introduced in https://reviews.llvm.org/D61446 rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libBye.a - # should not be installed (mlir) - rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/objects-Release/ - cp $(TARGET_BUILD_STAGE2)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin # Only run on executable, not script