From 5ca2adc3576c39bf7980ba94d1c8c89fb7e8092d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 8 Mar 2024 15:50:31 +0100 Subject: [PATCH] Drop hack --- debian/rules | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/debian/rules b/debian/rules index 67b35b18..7d4532b7 100755 --- a/debian/rules +++ b/debian/rules @@ -24,16 +24,7 @@ LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$N # dpkg-buildflags support # disable fixfilepath in favor of the llvm-project supplied flavor, disable lto export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto -ifeq ($(DEB_HOST_ARCH),i386) - RUNTIMES = compiler-rt;libcxx;libcxxabi -else - ifeq ($(DEB_HOST_ARCH_BITS),32) - RUNTIMES = libcxx;libcxxabi - skip_packages = -Nlibclang-rt-$(LLVM_VERSION)-dev - else - RUNTIMES = compiler-rt;libcxx;libcxxabi - endif -endif +RUNTIMES = compiler-rt;libcxx;libcxxabi SOURCE_NAME := $(shell dpkg-parsechangelog -S Source) ifneq (,$(findstring snapshot,$(SOURCE_NAME))) @@ -1380,7 +1371,7 @@ else rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake endif endif - dh_install --fail-missing ${skip_packages} + dh_install --fail-missing # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages # These packages are arch: all, so only do so when the packages are built ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages))) @@ -1508,11 +1499,8 @@ override_dh_auto_test: endif -override_dh_builddeb: - dh_builddeb ${skip_packages} - override_dh_gencontrol: stamps/sccache-stats - dh_gencontrol ${skip_packages} -- $(control_vars) + dh_gencontrol -- $(control_vars) override_dh_auto_clean: -- 2.39.5