diff --git a/debian/changelog b/debian/changelog
index ca3e4c80..1bb60414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp2) experimental
 
   * The triple change has been reverted. Keep it in Debian bring-back-triple-linux.diff
   * Fix the "all" build
+  * Disable LIBCXX_USE_COMPILER_RT on s390x as it fails. See bug 52022
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 02 Oct 2021 17:56:59 +0200
+
 llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) experimental; urgency=medium
 
   * experimental New snapshot release
diff --git a/debian/rules b/debian/rules
index b9562769..21fe17c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,12 @@ CMAKE_LIBCXX_EXTRA =
 
 BASE_PATH	:= $(CURDIR)
 LIBCXX_EXCEPTIONS :=ON
+LIBCXX_USE_COMPILER_RT := ON
 
 ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
-	LIBCXX_EXCEPTIONS :=OFF
+	LIBCXX_EXCEPTIONS := OFF
+# See https://bugs.llvm.org/show_bug.cgi?id=52022
+	LIBCXX_USE_COMPILER_RT := OFF
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mips mipsel powerpc powerpcspe riscv64))
@@ -447,12 +450,12 @@ override_dh_auto_configure: preconfigure
 	-DCLANG_BUILD_EXAMPLES=OFF \
 	-DLLVM_POLLY_LINK_INTO_TOOLS=ON \
 	-DLIBCXX_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
-	-DLIBCXX_USE_COMPILER_RT=ON \
+	-DLIBCXX_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \
 	-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
 	-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
 	-DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \
 	-DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
-	-DLIBCXXABI_USE_COMPILER_RT=ON \
+	-DLIBCXXABI_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \
 	-DBOOTSTRAP_CMAKE_CXX_FLAGS='$(BOOTSTRAP_CXXFLAGS_EXTRA)' \
 	-DBOOTSTRAP_CMAKE_C_FLAGS='$(BOOTSTRAP_CFLAGS_EXTRA)' \
 	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_VERBOSE_MAKEFILE;CMAKE_BUILD_TYPE;CMAKE_CXX_FLAGS_RELWITHDEBINFO;LLVM_LINK_LLVM_DYLIB;LLVM_INSTALL_UTILS;LLVM_VERSION_SUFFIX;LLVM_ENABLE_SPHINX;SPHINX_WARNINGS_AS_ERRORS;LLVM_BUILD_LLVM_DYLIB;LLVM_ENABLE_RTTI;LLVM_ENABLE_FFI;LIBCLANG_LIBRARY_VERSION;ENABLE_LINKER_BUILD_ID;POLLY_BUNDLED_JSONCPP;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;LLVM_USE_PERF;LLVM_ENABLE_ASSERTIONS;LLVM_BINUTILS_INCDIR;LLVM_HOST_TRIPLE;LLVM_COMPILER_CHECKED;COMPILER_RT_BUILD_BUILTINS;LIBOMP_LIBFLAGS;CMAKE_SHARED_LINKER_FLAGS;PYTHON_EXECUTABLE;LLVM_ENABLE_Z3_SOLVER;LLVM_POLLY_LINK_INTO_TOOLS;CLANG_VENDOR;LIBUNWIND_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT"|| tail -100 build-llvm/CMakeFiles/CMakeError.log