Skip to content

Commit bcdb3d3

Browse files
Merge #392
392: Update `arm-unknown-linux-gnueabihf`. r=therealprof a=reitermarkus Fixes #391. Co-authored-by: Markus Reiter <me@reitermark.us>
2 parents 2ddc30f + a53e5ed commit bcdb3d3

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:18.04
22

33
COPY common.sh /
44
RUN /common.sh
@@ -12,23 +12,19 @@ RUN /xargo.sh
1212
RUN mkdir /usr/arm-linux-gnueabihf && \
1313
apt-get install -y --no-install-recommends curl xz-utils && \
1414
cd /usr/arm-linux-gnueabihf && \
15-
curl -L https://releases.linaro.org/components/toolchain/binaries/7.5-2019.12/arm-linux-gnueabihf/gcc-linaro-7.5.0-2019.12-x86_64_arm-linux-gnueabihf.tar.xz | \
15+
curl -L https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz | \
1616
tar --strip-components 1 -xJ && \
1717
apt-get purge --auto-remove -y curl xz-utils
1818

1919
ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
2020

2121
COPY qemu.sh /
22-
2322
RUN /qemu.sh arm
2423

25-
RUN apt-get install -y --no-install-recommends \
26-
libc6-dev-armhf-cross
27-
2824
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
2925
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
3026
CC_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
3127
CXX_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
32-
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
33-
LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib:/usr/arm-linux-gnueabihf/arm-linux-gnueabihf/lib \
28+
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf/arm-linux-gnueabihf/libc \
29+
LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/arm-linux-gnueabihf/libc/lib:/usr/arm-linux-gnueabihf/arm-linux-gnueabihf/lib:/usr/arm-linux-gnueabihf/lib \
3430
RUST_TEST_THREADS=1

0 commit comments

Comments
 (0)