Skip to content

Commit c35cf7a

Browse files
committed
Use Bootlin toolchain.
1 parent 977b95c commit c35cf7a

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ worst, "hang" (never terminate).
196196
| `aarch64-unknown-linux-musl` | 1.1.20 | 6.3.0 | 1.0.2p | | 2.8.0 ||
197197
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2p || N/A ||
198198
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2p || 2.8.0 ||
199-
| `arm-unknown-linux-gnueabihf` | 2.19 | 4.8.3 | 1.0.2p || 2.8.0 ||
199+
| `arm-unknown-linux-gnueabihf` | 2.27 | 7.3.0 | 1.0.2p || 2.10 ||
200200
| `arm-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | 1.0.2p | | 2.8.0 ||
201201
| `arm-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | 1.0.2p | | 2.8.0 ||
202202
| `armv5te-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | N/A | | 2.8.0 ||

docker/arm-unknown-linux-gnueabihf/Dockerfile

+14-11
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,29 @@ COPY cmake.sh /
2424
RUN apt-get purge --auto-remove -y cmake && \
2525
bash /cmake.sh 3.5.1
2626

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
3133

34+
COPY openssl.sh qemu.sh /
35+
36+
RUN bash /qemu.sh arm
3237
ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
3338

34-
COPY openssl.sh qemu.sh /
3539
RUN apt-get install -y --no-install-recommends \
3640
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-
3942

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 \
4144
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++ \
4447
OPENSSL_DIR=/openssl \
4548
OPENSSL_INCLUDE_DIR=/openssl/include \
4649
OPENSSL_LIB_DIR=/openssl/lib \
4750
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 \
4952
RUST_TEST_THREADS=1

0 commit comments

Comments
 (0)