Skip to content

Commit 80f1912

Browse files
committed
Add eabi suffix to armv5te musl target
1 parent b71f636 commit 80f1912

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/bootstrap/configure.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def v(*args):
120120
"arm-unknown-linux-musleabi install directory")
121121
v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
122122
"arm-unknown-linux-musleabihf install directory")
123-
v("musl-root-armv5te", "target.armv5te-unknown-linux-musl.musl-root",
123+
v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
124124
"armv5te-unknown-linux-musleabi install directory")
125125
v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
126126
"armv7-unknown-linux-musleabihf install directory")

src/ci/docker/dist-armv5te-linux-musl/Dockerfile renamed to src/ci/docker/dist-armv5te-linux-musleabi/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ RUN env \
2929
bash musl.sh armv5te && \
3030
rm -rf /build/*
3131

32-
ENV TARGETS=armv5te-unknown-linux-musl
32+
ENV TARGETS=armv5te-unknown-linux-musleabi
3333

3434
# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271
3535
# get fixed and cc update
36-
ENV CC_armv5te_unknown_linux_musl=arm-linux-gnueabi-gcc \
37-
CFLAGS_armv5te_unknown_linux_musl="-march=armv5te -marm -mfloat-abi=soft"
36+
ENV CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \
37+
CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft"
3838

3939
ENV RUST_CONFIGURE_ARGS \
4040
--musl-root-armv5te=/musl-armv5te \

src/librustc_target/spec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ supported_targets! {
283283
("arm-unknown-linux-musleabihf", arm_unknown_linux_musleabihf),
284284
("armv4t-unknown-linux-gnueabi", armv4t_unknown_linux_gnueabi),
285285
("armv5te-unknown-linux-gnueabi", armv5te_unknown_linux_gnueabi),
286-
("armv5te-unknown-linux-musl", armv5te_unknown_linux_musl),
286+
("armv5te-unknown-linux-musleabi", armv5te_unknown_linux_musleabi),
287287
("armv7-unknown-linux-gnueabihf", armv7_unknown_linux_gnueabihf),
288288
("armv7-unknown-linux-musleabihf", armv7_unknown_linux_musleabihf),
289289
("aarch64-unknown-linux-gnu", aarch64_unknown_linux_gnu),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static TARGETS: &'static [&'static str] = &[
5757
"arm-unknown-linux-musleabi",
5858
"arm-unknown-linux-musleabihf",
5959
"armv5te-unknown-linux-gnueabi",
60-
"armv5te-unknown-linux-musl",
60+
"armv5te-unknown-linux-musleabi",
6161
"armv7-apple-ios",
6262
"armv7-linux-androideabi",
6363
"armv7-unknown-cloudabi-eabihf",

0 commit comments

Comments
 (0)