Skip to content

Commit fc9271a

Browse files
mati865gnzlbg
authored andcommitted
Unify PPC Dockerfiles
1 parent 9491dd2 commit fc9271a

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

ci/docker/powerpc-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ FROM ubuntu:18.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
6-
qemu-system-ppc \
7-
make \
8-
file
6+
qemu-system-ppc make file
97

108
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
119
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc -cpu Vger -L /usr/powerpc-linux-gnu" \
10+
CC=powerpc-linux-gnu-gcc \
1211
OBJDUMP=powerpc-linux-gnu-objdump

ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
4-
gcc \
5-
ca-certificates \
6-
libc6-dev \
7-
gcc-powerpc64-linux-gnu \
8-
libc6-dev-ppc64-cross \
9-
qemu-user \
10-
qemu-system-ppc \
11-
make \
12-
file
4+
gcc libc6-dev qemu-user ca-certificates \
5+
gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross \
6+
qemu-system-ppc file make
137

148
ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
159
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -L /usr/powerpc64-linux-gnu" \

0 commit comments

Comments
 (0)