From ee4d16b438f7c102736f6a12ac4a6082ab3d05f6 Mon Sep 17 00:00:00 2001 From: Erik Maciejewski Date: Fri, 15 Oct 2021 20:42:47 -0700 Subject: [PATCH] consolidate two conditionals for libatomic that were essentially the same, but the one removed could conflict with BOOTSTRAP_SHARED_LINK_FLAGS elsewhere in the rules file --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 61df365f..da4da048 100755 --- a/debian/rules +++ b/debian/rules @@ -57,18 +57,14 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x)) LIBCXX_EXCEPTIONS :=OFF endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mips mipsel powerpc powerpcspe riscv64)) -CMAKE_EXTRA += -DCMAKE_SHARED_LINKER_FLAGS="-latomic" -STAGE1_CMAKE_EXTRA += -DCMAKE_SHARED_LINKER_FLAGS="-latomic" -endif - ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel powerpc riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mips mipsel powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile -# itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion everywhere. +# itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion +# everywhere and in all stages LDFLAGS_EXTRA += -latomic endif