Add eabi suffix to armv5te musl target

rust-lang · May 4, 2018 · 80f1912 · 80f1912
1 parent b71f636
commit 80f1912
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
@@ -120,7 +120,7 @@ def v(*args):
   "arm-unknown-linux-musleabi install directory")
 v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
   "arm-unknown-linux-musleabihf install directory")
-v("musl-root-armv5te", "target.armv5te-unknown-linux-musl.musl-root",
+v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
   "armv5te-unknown-linux-musleabi install directory")
 v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
   "armv7-unknown-linux-musleabihf install directory")

diff --git a/...docker/dist-armv5te-linux-musl/Dockerfile → ...er/dist-armv5te-linux-musleabi/Dockerfile b/...docker/dist-armv5te-linux-musl/Dockerfile → ...er/dist-armv5te-linux-musleabi/Dockerfile
@@ -29,12 +29,12 @@ RUN env \
     bash musl.sh armv5te && \
     rm -rf /build/*
 
-ENV TARGETS=armv5te-unknown-linux-musl
+ENV TARGETS=armv5te-unknown-linux-musleabi
 
 # FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271
 #        get fixed and cc update
-ENV CC_armv5te_unknown_linux_musl=arm-linux-gnueabi-gcc \
-    CFLAGS_armv5te_unknown_linux_musl="-march=armv5te -marm -mfloat-abi=soft"
+ENV CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \
+    CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft"
 
 ENV RUST_CONFIGURE_ARGS \
       --musl-root-armv5te=/musl-armv5te \

diff --git a/...target/spec/armv5te_unknown_linux_musl.rs → ...et/spec/armv5te_unknown_linux_musleabi.rs b/...target/spec/armv5te_unknown_linux_musl.rs → ...et/spec/armv5te_unknown_linux_musleabi.rs
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
@@ -283,7 +283,7 @@ supported_targets! {
     ("arm-unknown-linux-musleabihf", arm_unknown_linux_musleabihf),
     ("armv4t-unknown-linux-gnueabi", armv4t_unknown_linux_gnueabi),
     ("armv5te-unknown-linux-gnueabi", armv5te_unknown_linux_gnueabi),
-    ("armv5te-unknown-linux-musl", armv5te_unknown_linux_musl),
+    ("armv5te-unknown-linux-musleabi", armv5te_unknown_linux_musleabi),
     ("armv7-unknown-linux-gnueabihf", armv7_unknown_linux_gnueabihf),
     ("armv7-unknown-linux-musleabihf", armv7_unknown_linux_musleabihf),
     ("aarch64-unknown-linux-gnu", aarch64_unknown_linux_gnu),

diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -57,7 +57,7 @@ static TARGETS: &'static [&'static str] = &[
     "arm-unknown-linux-musleabi",
     "arm-unknown-linux-musleabihf",
     "armv5te-unknown-linux-gnueabi",
-    "armv5te-unknown-linux-musl",
+    "armv5te-unknown-linux-musleabi",
     "armv7-apple-ios",
     "armv7-linux-androideabi",
     "armv7-unknown-cloudabi-eabihf",