File tree Expand file tree Collapse file tree 1 file changed +4
-8
lines changed Expand file tree Collapse file tree 1 file changed +4
-8
lines changed Original file line number Diff line number Diff line change 1
- FROM ubuntu:16 .04
1
+ FROM ubuntu:18 .04
2
2
3
3
COPY common.sh /
4
4
RUN /common.sh
@@ -12,23 +12,19 @@ RUN /xargo.sh
12
12
RUN mkdir /usr/arm-linux-gnueabihf && \
13
13
apt-get install -y --no-install-recommends curl xz-utils && \
14
14
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 | \
16
16
tar --strip-components 1 -xJ && \
17
17
apt-get purge --auto-remove -y curl xz-utils
18
18
19
19
ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
20
20
21
21
COPY qemu.sh /
22
-
23
22
RUN /qemu.sh arm
24
23
25
- RUN apt-get install -y --no-install-recommends \
26
- libc6-dev-armhf-cross
27
-
28
24
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
29
25
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
30
26
CC_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
31
27
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 \
34
30
RUST_TEST_THREADS=1
You can’t perform that action at this time.
0 commit comments