[gentoo-commits] proj/musl:master commit in: dev-lang/rust/

[Anthony G. Basile]

commit:     1b9a86ae69ba55a04e287f07948d49ad74927dc1
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Fri Apr 27 04:58:33 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 10:32:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1b9a86ae

dev-lang/rust: fix CHOST detection for arm on 17.0 profile

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 dev-lang/rust/rust-1.21.0.ebuild    | 4 ++--
 dev-lang/rust/rust-1.23.0-r1.ebuild | 4 ++--
 dev-lang/rust/rust-1.23.0.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild
index 89bfe31..3140b1d 100644
--- a/dev-lang/rust/rust-1.21.0.ebuild
+++ b/dev-lang/rust/rust-1.21.0.ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 case "${CHOST}" in
-       armv7a-hardfloat-*)
+       armv7a*)
                RUSTARCH=armv7 ;;
        arm*)
                RUSTARCH=arm ;;
@@ -35,7 +35,7 @@ case "${CHOST}" in
        armv7a-hardfloat-*)
                RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;;
        arm*)
-               RUSTLIBC=${ELIBC/glibc/gnu}eabi ;;
+               RUSTLIBC=${CHOST##*-} ;;
        *)
                RUSTLIBC=${ELIBC/glibc/gnu} ;;
 esac

diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild 
b/dev-lang/rust/rust-1.23.0-r1.ebuild
index c96312b..caf1009 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 case "${CHOST}" in
-       armv7a-hardfloat-*)
+       armv7*)
                RUSTARCH=armv7 ;;
        arm*)
                RUSTARCH=arm ;;
@@ -35,7 +35,7 @@ case "${CHOST}" in
        armv7a-hardfloat-*)
                RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;;
        arm*)
-               RUSTLIBC=${ELIBC/glibc/gnu}eabi ;;
+               RUSTLIBC=${CHOST##*-} ;;
        *)
                RUSTLIBC=${ELIBC/glibc/gnu} ;;
 esac

diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild
index f332528..0153f9a 100644
--- a/dev-lang/rust/rust-1.23.0.ebuild
+++ b/dev-lang/rust/rust-1.23.0.ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 case "${CHOST}" in
-       armv7a-hardfloat-*)
+       armv7*)
                RUSTARCH=armv7 ;;
        arm*)
                RUSTARCH=arm ;;
@@ -35,7 +35,7 @@ case "${CHOST}" in
        armv7a-hardfloat-*)
                RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;;
        arm*)
-               RUSTLIBC=${ELIBC/glibc/gnu}eabi ;;
+               RUSTLIBC=${CHOST##*-} ;;
        *)
                RUSTLIBC=${ELIBC/glibc/gnu} ;;
 esac