diff --git a/debian/changelog b/debian/changelog index f84ded1f..8e1f0350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ llvm-toolchain-17 (1:17.0.6-8) UNRELEASED; urgency=medium * Make libclang-common-18-dev architecture dependent, mark profile and xray include files as optional on armel and armhf. * Fix sanitizer build on 32bit time_t64 architectures. + * Enable compiler-rt runtime again for 32bit time_t64 architectures. - -- Matthias Klose Thu, 07 Mar 2024 16:56:50 +0100 + -- Matthias Klose Fri, 08 Mar 2024 14:52:29 +0100 llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 6b30a66c..1c4a6a34 100755 --- a/debian/rules +++ b/debian/rules @@ -24,16 +24,8 @@ 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)))