Skip to content
/ rust Public
forked from rust-lang/rust

Commit 3cd3a91

Browse files
committed
ci: use armv7-a+fp for armv7-unknown-linux_musleabihf
This is consistent with what we had from `arm-linux-gnueabihf-gcc` in the `ubuntu:20.04` base.
1 parent 3585562 commit 3cd3a91

File tree

1 file changed

+3
-3
lines changed
  • src/ci/docker/host-x86_64/dist-various-1

1 file changed

+3
-3
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ RUN env \
7474
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm -mfpu=vfp" \
7575
bash musl.sh armhf && \
7676
env \
77-
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a -mfpu=vfp3" \
78-
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a -mfpu=vfp3" \
77+
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a+fp" \
78+
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a+fp" \
7979
bash musl.sh armv7hf && \
8080
env \
8181
CC=mips-openwrt-linux-gcc \
@@ -148,7 +148,7 @@ ENV TARGETS=$TARGETS,armv7a-none-eabi
148148
ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
149149
CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \
150150
CFLAGS_arm_unknown_linux_musleabihf="-march=armv6 -marm -mfpu=vfp" \
151-
CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a -mfpu=vfp3" \
151+
CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a+fp" \
152152
CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
153153
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
154154
CC_mips64el_unknown_linux_muslabi64=mips64el-linux-gnuabi64-gcc \

0 commit comments

Comments
 (0)