Skip to content

Commit 8abbd0b

Browse files
committed
for now, do not build rust-std for the armv7a-none-eabihf target
it needs some upstream changes in the build script of the compiler-builtins crate
1 parent a3a0776 commit 8abbd0b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ ENV TARGETS=$TARGETS,armv7r-none-eabi
161161
ENV TARGETS=$TARGETS,armv7r-none-eabihf
162162
ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
163163
ENV TARGETS=$TARGETS,armv7a-none-eabi
164-
ENV TARGETS=$TARGETS,armv7a-none-eabihf
165164

166165
# riscv targets currently do not need a C compiler, as compiler_builtins
167166
# doesn't currently have it enabled, and the riscv gcc compiler is not
@@ -177,6 +176,8 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
177176
CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
178177
CC_armv7a_none_eabi=arm-none-eabi-gcc \
179178
CC_armv7a_none_eabihf=arm-none-eabi-gcc \
179+
CFLAGS_armv7a_none_eabi=-march=armv7-a \
180+
CFLAGS_armv7a_none_eabihf=-march=armv7-a+vfpv3 \
180181
CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
181182
AR_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-ar \
182183
CXX_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-g++ \

src/tools/build-manifest/src/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ static TARGETS: &[&str] = &[
7070
"armv7-unknown-linux-gnueabi",
7171
"armv7-unknown-linux-gnueabihf",
7272
"armv7a-none-eabi",
73-
"armv7a-none-eabihf",
7473
"thumbv7neon-unknown-linux-gnueabihf",
7574
"armv7-unknown-linux-musleabi",
7675
"armv7-unknown-linux-musleabihf",

0 commit comments

Comments
 (0)