Skip to content

Commit 4a48f31

Browse files
committed
Merge #83: ci: Fix "s390x (big-endian)" task
0498084 ci: Fix "s390x (big-endian)" task (Hennadii Stepanov) Pull request description: ACKs for top commit: sipa: utACK 0498084 fanquake: ACK 0498084 Tree-SHA512: e5b9b6f1eeb1ef0b67c7620fbd8331d2bc05ca8f03bbec67dc57236525f4cb728d31e6273763b3dfb2d6fad7e901fbd450d28a38e074d6a4de9d5bb76d0c7036
2 parents 71709dc + 0498084 commit 4a48f31

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.cirrus.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,11 @@ task:
132132
cpu: 4
133133
memory: 2G
134134
env:
135-
EXEC_CMD: qemu-s390x -L /usr/s390x-linux-gnu
135+
EXEC_CMD: qemu-s390x
136136
HOST: s390x-linux-gnu
137137
BUILD:
138138
<< : *MERGE_BASE
139139
test_script:
140-
# https://sourceware.org/bugzilla/show_bug.cgi?id=27008
141-
- rm /etc/ld.so.cache
142140
- ./ci/cirrus.sh
143141
<< : *CAT_LOGS
144142

ci/linux-debian.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get install --no-install-recommends --no-upgrade -y \
1010
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
1111
gcc g++ clang libclang-rt-dev libc6-dbg \
1212
gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \
13-
g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
13+
g++-s390x-linux-gnu libstdc++6:s390x gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
1414
wine wine64 g++-mingw-w64-x86-64
1515

1616
# Run a dummy command in wine to make it set up configuration

0 commit comments

Comments
 (0)