From 0be4a74ce8ee6e0fd57218fe642c47cfd3068ecc Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 21 Mar 2023 11:27:46 +0100 Subject: [PATCH] Revert gold linker usage on riscv64, making the build not even start --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3430882a..440e28b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-16 (1:16.0.0-1~exp3) UNRELEASED; urgency=medium + + * Revert gold linker on riscv64, FTBFS + + -- Gianfranco Costamagna Tue, 21 Mar 2023 11:27:33 +0100 + llvm-toolchain-16 (1:16.0.0-1~exp2) experimental; urgency=medium [ Matthias Klose ] diff --git a/debian/rules b/debian/rules index 3d0d5aad..21228a72 100755 --- a/debian/rules +++ b/debian/rules @@ -278,7 +278,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)" endif -BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el riscv64 x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 +BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0) ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold