Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 29 Jan 2020 07:52:02
Message-Id: 1580284260.2b9bda10d3b7217a30ecb9c9f3eededfcd1f6261.gyakovlev@gentoo
1 commit: 2b9bda10d3b7217a30ecb9c9f3eededfcd1f6261
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 29 07:15:54 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 29 07:51:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9bda10
7
8 rust-toolchain.eclass: add basic musl support on amd64
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 eclass/rust-toolchain.eclass | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
16 index 304ee905245..5126fb96a89 100644
17 --- a/eclass/rust-toolchain.eclass
18 +++ b/eclass/rust-toolchain.eclass
19 @@ -39,7 +39,8 @@ rust_abi() {
20 mips64*) echo mips64-unknown-linux-gnuabi64;;
21 powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
22 powerpc64*) echo powerpc64-unknown-linux-gnu;;
23 - x86_64*) echo x86_64-unknown-linux-gnu;;
24 + x86_64*gnu) echo x86_64-unknown-linux-gnu;;
25 + x86_64*musl) echo x86_64-unknown-linux-musl;;
26 armv6j*s*) echo arm-unknown-linux-gnueabi;;
27 armv6j*h*) echo arm-unknown-linux-gnueabihf;;
28 armv7a*h*) echo armv7-unknown-linux-gnueabihf;;
29 @@ -103,7 +104,8 @@ rust_arch_uri() {
30 rust_all_arch_uris()
31 {
32 local uris=""
33 - uris+="amd64? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) "
34 + uris+="amd64? ( elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") )
35 + elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) ) "
36 uris+="arm? ( $(rust_arch_uri arm-unknown-linux-gnueabi "$@")
37 $(rust_arch_uri arm-unknown-linux-gnueabihf "$@")
38 $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") ) "