@@ -24,26 +24,29 @@ COPY cmake.sh /
24
24
RUN apt-get purge --auto-remove -y cmake && \
25
25
bash /cmake.sh 3.5.1
26
26
27
- RUN git clone --depth 1 https://github.com/raspberrypi/tools.git /pi-tools && \
28
- mv /pi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64 /usr/arm-linux-gnueabihf && \
29
- mv /pi-tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot /usr/arm-linux-gnueabihf/sysroot && \
30
- rm -r /pi-tools
27
+ RUN mkdir /usr/arm-linux-gnueabihf && \
28
+ apt-get install -y --no-install-recommends curl && \
29
+ cd /usr/arm-linux-gnueabihf && \
30
+ curl -L https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2018.11-1.tar.bz2 | \
31
+ tar --strip-components 1 -xj && \
32
+ apt-get purge --auto-remove -y curl
31
33
34
+ COPY openssl.sh qemu.sh /
35
+
36
+ RUN bash /qemu.sh arm
32
37
ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
33
38
34
- COPY openssl.sh qemu.sh /
35
39
RUN apt-get install -y --no-install-recommends \
36
40
libc6-dev-armhf-cross && \
37
- bash /openssl.sh linux-armv4 arm-linux-gnueabihf- && \
38
- bash /qemu.sh arm
41
+ bash /openssl.sh linux-armv4 arm-linux-
39
42
40
- ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf- gcc \
43
+ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gcc \
41
44
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
42
- CC_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf- gcc \
43
- CXX_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf- g++ \
45
+ CC_arm_unknown_linux_gnueabihf=arm-linux-gcc \
46
+ CXX_arm_unknown_linux_gnueabihf=arm-linux-g++ \
44
47
OPENSSL_DIR=/openssl \
45
48
OPENSSL_INCLUDE_DIR=/openssl/include \
46
49
OPENSSL_LIB_DIR=/openssl/lib \
47
50
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
48
- LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib:/usr/arm-linux-gnueabihf/sysroot /lib \
51
+ LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib:/usr/arm-linux-gnueabihf/arm-buildroot-linux-gnueabihf /lib \
49
52
RUST_TEST_THREADS=1
0 commit comments