[gentoo-commits] repo/gentoo:master commit in: eclass/

[Georgy Yakovlev]

commit:     2b9bda10d3b7217a30ecb9c9f3eededfcd1f6261
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 07:15:54 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 07:51:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9bda10

rust-toolchain.eclass: add basic musl support on amd64

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 eclass/rust-toolchain.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 304ee905245..5126fb96a89 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -39,7 +39,8 @@ rust_abi() {
                mips64*)          echo mips64-unknown-linux-gnuabi64;;
                powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
                powerpc64*)   echo powerpc64-unknown-linux-gnu;;
-               x86_64*)          echo x86_64-unknown-linux-gnu;;
+               x86_64*gnu)       echo x86_64-unknown-linux-gnu;;
+               x86_64*musl)  echo x86_64-unknown-linux-musl;;
                armv6j*s*)        echo arm-unknown-linux-gnueabi;;
                armv6j*h*)        echo arm-unknown-linux-gnueabihf;;
                armv7a*h*)        echo armv7-unknown-linux-gnueabihf;;
@@ -103,7 +104,8 @@ rust_arch_uri() {
 rust_all_arch_uris()
 {
   local uris=""
-  uris+="amd64? ( $(rust_arch_uri x86_64-unknown-linux-gnu       "$@") ) "
+  uris+="amd64? ( elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu 
"$@") ) 
+                  elibc_musl?  ( $(rust_arch_uri x86_64-unknown-linux-musl 
"$@") ) ) "
   uris+="arm?   ( $(rust_arch_uri arm-unknown-linux-gnueabi      "$@")
                   $(rust_arch_uri arm-unknown-linux-gnueabihf    "$@")
                   $(rust_arch_uri armv7-unknown-linux-gnueabihf  "$@") ) "