Skip to content

Commit fefe816

Browse files
committed
Auto merge of #52561 - ljedrz:fixme_cc_271, r=alexcrichton
Remove obsolete armv5te vars from the dist-various-1 Dockerfile The [related cc issue](rust-lang/cc-rs#271) is closed and its changes are in force.
2 parents 1398572 + 35a3d6f commit fefe816

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,10 @@ ENV TARGETS=$TARGETS,thumbv7m-none-eabi
103103
ENV TARGETS=$TARGETS,thumbv7em-none-eabi
104104
ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
105105

106-
# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271
107-
# get fixed and cc update
108106
ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
109107
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
110108
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
111-
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
112-
CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
113-
CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft" \
114-
CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \
115-
CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft"
109+
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc
116110

117111
ENV RUST_CONFIGURE_ARGS \
118112
--musl-root-armv5te=/musl-armv5te \

0 commit comments

Comments
 (0)