diff --git a/debian/changelog b/debian/changelog index 0da8721d..f45a835e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ llvm-toolchain-18 (1:18.1.0-3) UNRELEASED; urgency=medium + [ Matthias Klose ] * Fix sanitizer build on 32bit time_t64 architectures. * Enable compiler-rt runtime again for 32bit time_t64 architectures. * Revert: mark profile and xray include files as optional on armel and armhf. - -- Matthias Klose Thu, 07 Mar 2024 17:02:04 +0100 + [ Sylvestre Ledru ] + * Disable libc on bionic for apt.llvm.org + + -- Sylvestre Ledru Fri, 08 Mar 2024 20:27:05 +0100 llvm-toolchain-18 (1:18.1.0-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index d57e9d99..4a5d0b52 100755 --- a/debian/rules +++ b/debian/rules @@ -309,11 +309,14 @@ ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) endif LIBC_ENABLE=no +LIBC_DISABLE_DISTRO := bionic ifneq (,$(filter libllvmlibc-$(LLVM_VERSION)-dev, $(packages))) +ifneq (,$(filter $(DISTRO),$(LIBC_DISABLE_DISTRO))) BOOTSTRAP_CMAKE_EXTRA += -DBOOTSTRAP_LIBC_INCLUDE_DOCS=ON RUNTIMES += ;libc LIBC_ENABLE=yes endif +endif # flang is only for 64bits ifneq (,$(filter flang-$(LLVM_VERSION), $(packages)))