From 0498084d3197c83a740863a48350bae86c61ab4f Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 10 Apr 2024 22:15:34 +0200
Subject: [PATCH] ci: Fix "s390x (big-endian)" task

---
 .cirrus.yml                | 4 +---
 ci/linux-debian.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 76b05ca..5ceefee 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -132,13 +132,11 @@ task:
     cpu: 4
     memory: 2G
   env:
-    EXEC_CMD: qemu-s390x -L /usr/s390x-linux-gnu
+    EXEC_CMD: qemu-s390x
     HOST: s390x-linux-gnu
     BUILD:
   << : *MERGE_BASE
   test_script:
-    # https://sourceware.org/bugzilla/show_bug.cgi?id=27008
-    - rm /etc/ld.so.cache
     - ./ci/cirrus.sh
   << : *CAT_LOGS
 
diff --git a/ci/linux-debian.Dockerfile b/ci/linux-debian.Dockerfile
index 3ca01f8..122af36 100644
--- a/ci/linux-debian.Dockerfile
+++ b/ci/linux-debian.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get install --no-install-recommends --no-upgrade -y \
         make automake libtool pkg-config dpkg-dev valgrind qemu-user \
         gcc g++ clang libclang-rt-dev libc6-dbg \
         gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \
-        g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
+        g++-s390x-linux-gnu libstdc++6:s390x gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
         wine wine64 g++-mingw-w64-x86-64
 
 # Run a dummy command in wine to make it set up configuration