Skip to content

Commit 7c152e7

Browse files
committed
build aarch64-musl host compiler in CI
fixes #75721
1 parent 30f0a07 commit 7c152e7

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM ubuntu:16.04
22

3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
g++-aarch64-linux-gnu
5+
36
COPY scripts/cross-apt-packages.sh /scripts/
47
RUN sh /scripts/cross-apt-packages.sh
58

@@ -24,17 +27,25 @@ USER root
2427
COPY scripts/sccache.sh /scripts/
2528
RUN sh /scripts/sccache.sh
2629

30+
COPY scripts/musl.sh /scripts/
31+
RUN env \
32+
CC=aarch64-linux-gnu-gcc \
33+
CXX=aarch64-linux-gnu-g++ \
34+
bash /scripts/musl.sh aarch64
35+
2736
ENV PATH=$PATH:/x-tools/aarch64-unknown-linux-gnueabi/bin
2837

2938
ENV CC_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-gcc \
3039
AR_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-ar \
3140
CXX_aarch64_unknown_linux_gnu=aarch64-unknown-linux-gnueabi-g++
3241

33-
ENV HOSTS=aarch64-unknown-linux-gnu
42+
ENV HOSTS=aarch64-unknown-linux-gnu,aarch64-unknown-linux-musl
3443

3544
ENV RUST_CONFIGURE_ARGS \
3645
--enable-full-tools \
3746
--enable-profiler \
3847
--enable-sanitizers \
48+
--musl-root-aarch64=/musl-aarch64 \
3949
--disable-docs
50+
4051
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ RUN env \
8383
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a" \
8484
bash musl.sh armv7hf && \
8585
env \
86-
CC=aarch64-linux-gnu-gcc \
87-
CXX=aarch64-linux-gnu-g++ \
88-
bash musl.sh aarch64 && \
89-
env \
9086
CC=mips-openwrt-linux-gcc \
9187
CXX=mips-openwrt-linux-g++ \
9288
bash musl.sh mips && \
@@ -129,7 +125,6 @@ ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf
129125
ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi
130126
ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi
131127
ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf
132-
ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl
133128
ENV TARGETS=$TARGETS,aarch64-unknown-none
134129
ENV TARGETS=$TARGETS,aarch64-unknown-none-softfloat
135130
ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu
@@ -184,7 +179,6 @@ ENV RUST_CONFIGURE_ARGS \
184179
--musl-root-arm=/musl-arm \
185180
--musl-root-armhf=/musl-armhf \
186181
--musl-root-armv7hf=/musl-armv7hf \
187-
--musl-root-aarch64=/musl-aarch64 \
188182
--musl-root-mips=/musl-mips \
189183
--musl-root-mipsel=/musl-mipsel \
190184
--musl-root-mips64=/musl-mips64 \

src/doc/rustc/src/platform-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ target | std | host | notes
6262
`aarch64-linux-android` | ✓ | | ARM64 Android
6363
`aarch64-pc-windows-msvc` | ✓ | | ARM64 Windows MSVC
6464
`aarch64-unknown-linux-gnu` | ✓ | ✓ | ARM64 Linux (kernel 4.2, glibc 2.17)
65-
`aarch64-unknown-linux-musl` | ✓ | | ARM64 Linux with MUSL
65+
`aarch64-unknown-linux-musl` | ✓ | | ARM64 Linux with MUSL
6666
`aarch64-unknown-none` | * | | Bare ARM64, hardfloat
6767
`aarch64-unknown-none-softfloat` | * | | Bare ARM64, softfloat
6868
`arm-linux-androideabi` | ✓ | | ARMv7 Android

0 commit comments

Comments
 (0)