aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefson <herrtimson@yahoo.de>2018-04-27 06:58:33 +0200
committerAnthony G. Basile <blueness@gentoo.org>2018-04-27 06:32:31 -0400
commit1b9a86ae69ba55a04e287f07948d49ad74927dc1 (patch)
tree060a9d02538a0bef40e466859ef955993fee8884 /dev-lang
parentsys-block/thin-provisioning-tools: sync (diff)
downloadmusl-1b9a86ae69ba55a04e287f07948d49ad74927dc1.tar.gz
musl-1b9a86ae69ba55a04e287f07948d49ad74927dc1.tar.bz2
musl-1b9a86ae69ba55a04e287f07948d49ad74927dc1.zip
dev-lang/rust: fix CHOST detection for arm on 17.0 profile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/rust/rust-1.21.0.ebuild4
-rw-r--r--dev-lang/rust/rust-1.23.0-r1.ebuild4
-rw-r--r--dev-lang/rust/rust-1.23.0.ebuild4
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