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

[Arthur Zamarin]

commit:     e1e4f7a904235dee36d00eb23dcfcf66519c27e6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 06:57:12 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 10:23:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e4f7a9

rust-toolchain.eclass: support riscv64*musl

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

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

diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 5824a48734f9..5484d150614f 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: rust-toolchain.eclass
@@ -48,7 +48,8 @@ rust_abi() {
                powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
                powerpc64*)   echo powerpc64-unknown-linux-gnu;;
                powerpc*)     echo powerpc-unknown-linux-gnu;;
-               riscv64*)     echo riscv64gc-unknown-linux-gnu;;
+               riscv64*gnu)  echo riscv64gc-unknown-linux-gnu;;
+               riscv64*musl) echo riscv64gc-unknown-linux-musl;;
                s390x*)       echo s390x-unknown-linux-gnu;;
                x86_64*gnu)   echo x86_64-unknown-linux-gnu;;
                x86_64*musl)  echo x86_64-unknown-linux-musl;;
@@ -127,7 +128,9 @@ rust_all_arch_uris()
                big-endian?  ( $(rust_arch_uri powerpc64-unknown-linux-gnu   
"$@") )
                !big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu 
"$@") )
        )
-       riscv? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") )
+       riscv? (
+               elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu 
"$@") )
+       )
        s390?  ( $(rust_arch_uri s390x-unknown-linux-gnu     "$@") )
        "