Skip to content

Commit 106b3e9

Browse files
committed
Auto merge of #57862 - hsivonen:buildneon, r=alexcrichton
Build the standard library for thumbv7neon-unknown-linux-gnueabihf in CI Using the `dist-armv7-linux` image instead of `dist-various-1` in order to use the ARMv7 toolchain available in `dist-armv7-linux`. Closes #57030.
2 parents 5f60208 + 7dbb70e commit 106b3e9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,17 @@ ENV TARGETS=$TARGETS,armebv7r-none-eabi
116116
ENV TARGETS=$TARGETS,armebv7r-none-eabihf
117117
ENV TARGETS=$TARGETS,armv7r-none-eabi
118118
ENV TARGETS=$TARGETS,armv7r-none-eabihf
119+
ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
119120

120121
ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
121122
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
122123
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
123124
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
124-
CC_armebv7r_none_eabi=arm-none-eabi-gcc
125-
125+
CC_armebv7r_none_eabi=arm-none-eabi-gcc \
126+
CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
127+
AR_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar \
128+
CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
129+
126130
ENV RUST_CONFIGURE_ARGS \
127131
--musl-root-armv5te=/musl-armv5te \
128132
--musl-root-arm=/musl-arm \

0 commit comments

Comments
 (0)