Skip to content

Commit 235af75

Browse files
committed
Merge armv5te musl container with dist-various-1
1 parent 80f1912 commit 235af75

File tree

2 files changed

+9
-48
lines changed

2 files changed

+9
-48
lines changed

src/ci/docker/dist-armv5te-linux-musleabi/Dockerfile

-47
This file was deleted.

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ ENV STAGING_DIR=/tmp
4343

4444
COPY scripts/musl.sh /build
4545
RUN env \
46+
CC=arm-linux-gnueabi-gcc CFLAGS="-march=armv5te -marm -mfloat-abi=soft" \
47+
CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv5te -marm -mfloat-abi=soft" \
48+
bash musl.sh armv5te && \
49+
env \
4650
CC=arm-linux-gnueabi-gcc CFLAGS="-march=armv6 -marm" \
4751
CXX=arm-linux-gnueabi-g++ CXXFLAGS="-march=armv6 -marm" \
4852
bash musl.sh arm && \
@@ -84,6 +88,7 @@ ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl
8488
ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi
8589
ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf
8690
ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi
91+
ENV TARGETS=$TARGETS,armv5te-unknown-linux-musleabi
8792
ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf
8893
ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl
8994
ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu
@@ -100,9 +105,12 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
100105
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
101106
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
102107
CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
103-
CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft"
108+
CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft" \
109+
CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \
110+
CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft"
104111

105112
ENV RUST_CONFIGURE_ARGS \
113+
--musl-root-armv5te=/musl-armv5te \
106114
--musl-root-arm=/musl-arm \
107115
--musl-root-armhf=/musl-armhf \
108116
--musl-root-armv7=/musl-armv7 \

0 commit comments

Comments
 (0)