Skip to content

Commit 2419f06

Browse files
committed
Auto merge of #3637 - cuviper:custom-powerpc-s390x, r=alexcrichton
Update docker/cross for new IBM toolchains This will start using the toolchains with older glibc ABI for powerpc, powerpc64, powerpc64le, and s390x, per rust-lang-deprecated/rust-buildbot#149.
2 parents c0650fb + 1cfc7ac commit 2419f06

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: src/ci/docker/cross/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alexcrichton/rust-slave-linux-cross:2016-10-11c
1+
FROM alexcrichton/rust-slave-linux-cross:2017-02-02
22
ENTRYPOINT []
33

44
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
@@ -13,6 +13,6 @@ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
1313
CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
1414
CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
1515
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
16-
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc-5 \
16+
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
1717
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
1818
CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc

0 commit comments

Comments
 (0)