mlir: use the cmake option to avoid installing object files MLIR_INSTALL_AGGREGATE_OBJECTS Closes upstream #53134

This commit is contained in:
Sylvestre Ledru 2022-02-05 11:08:21 +01:00
parent 3d36be737b
commit b990b953f0
2 changed files with 8 additions and 7 deletions

8
debian/changelog vendored
View File

@ -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 * mlir: use the cmake option to avoid installing object files
* experimental New snapshot release MLIR_INSTALL_AGGREGATE_OBJECTS
* experimental New snapshot release Closes upstream #53134
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 05 Jan 2022 23:21:56 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Wed, 05 Jan 2022 23:21:56 +0100

7
debian/rules vendored
View File

@ -262,6 +262,10 @@ ifeq ($(LIBUNWIND_ENABLE),yes)
endif endif
endif endif
# Do not install objects
STAGE_ALL_CMAKE_EXTRA += -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
RUN_TEST=yes RUN_TEST=yes
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
RUN_TEST=no RUN_TEST=no
@ -687,9 +691,6 @@ override_dh_auto_install:
# Remove an example - introduced in https://reviews.llvm.org/D61446 # Remove an example - introduced in https://reviews.llvm.org/D61446
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libBye.a 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 cp $(TARGET_BUILD_STAGE2)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin
# Only run on executable, not script # Only run on executable, not script