1 |
commit: 1b9a86ae69ba55a04e287f07948d49ad74927dc1 |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Fri Apr 27 04:58:33 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 10:32:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1b9a86ae |
7 |
|
8 |
dev-lang/rust: fix CHOST detection for arm on 17.0 profile |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
dev-lang/rust/rust-1.21.0.ebuild | 4 ++-- |
13 |
dev-lang/rust/rust-1.23.0-r1.ebuild | 4 ++-- |
14 |
dev-lang/rust/rust-1.23.0.ebuild | 4 ++-- |
15 |
3 files changed, 6 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild |
18 |
index 89bfe31..3140b1d 100644 |
19 |
--- a/dev-lang/rust/rust-1.21.0.ebuild |
20 |
+++ b/dev-lang/rust/rust-1.21.0.ebuild |
21 |
@@ -24,7 +24,7 @@ else |
22 |
fi |
23 |
|
24 |
case "${CHOST}" in |
25 |
- armv7a-hardfloat-*) |
26 |
+ armv7a*) |
27 |
RUSTARCH=armv7 ;; |
28 |
arm*) |
29 |
RUSTARCH=arm ;; |
30 |
@@ -35,7 +35,7 @@ case "${CHOST}" in |
31 |
armv7a-hardfloat-*) |
32 |
RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;; |
33 |
arm*) |
34 |
- RUSTLIBC=${ELIBC/glibc/gnu}eabi ;; |
35 |
+ RUSTLIBC=${CHOST##*-} ;; |
36 |
*) |
37 |
RUSTLIBC=${ELIBC/glibc/gnu} ;; |
38 |
esac |
39 |
|
40 |
diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild b/dev-lang/rust/rust-1.23.0-r1.ebuild |
41 |
index c96312b..caf1009 100644 |
42 |
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild |
43 |
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild |
44 |
@@ -24,7 +24,7 @@ else |
45 |
fi |
46 |
|
47 |
case "${CHOST}" in |
48 |
- armv7a-hardfloat-*) |
49 |
+ armv7*) |
50 |
RUSTARCH=armv7 ;; |
51 |
arm*) |
52 |
RUSTARCH=arm ;; |
53 |
@@ -35,7 +35,7 @@ case "${CHOST}" in |
54 |
armv7a-hardfloat-*) |
55 |
RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;; |
56 |
arm*) |
57 |
- RUSTLIBC=${ELIBC/glibc/gnu}eabi ;; |
58 |
+ RUSTLIBC=${CHOST##*-} ;; |
59 |
*) |
60 |
RUSTLIBC=${ELIBC/glibc/gnu} ;; |
61 |
esac |
62 |
|
63 |
diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild |
64 |
index f332528..0153f9a 100644 |
65 |
--- a/dev-lang/rust/rust-1.23.0.ebuild |
66 |
+++ b/dev-lang/rust/rust-1.23.0.ebuild |
67 |
@@ -24,7 +24,7 @@ else |
68 |
fi |
69 |
|
70 |
case "${CHOST}" in |
71 |
- armv7a-hardfloat-*) |
72 |
+ armv7*) |
73 |
RUSTARCH=armv7 ;; |
74 |
arm*) |
75 |
RUSTARCH=arm ;; |
76 |
@@ -35,7 +35,7 @@ case "${CHOST}" in |
77 |
armv7a-hardfloat-*) |
78 |
RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;; |
79 |
arm*) |
80 |
- RUSTLIBC=${ELIBC/glibc/gnu}eabi ;; |
81 |
+ RUSTLIBC=${CHOST##*-} ;; |
82 |
*) |
83 |
RUSTLIBC=${ELIBC/glibc/gnu} ;; |
84 |
esac |