eclass/rust-toolchain: Sync with Gentoo

It's from Gentoo commit 99889ce76e1f6ed0ec5cb4e3db3a09dce8de1f05.
This commit is contained in:
Flatcar Buildbot 2024-08-19 07:18:22 +00:00 committed by Krzesimir Nowak
parent 00ee3e15c6
commit b240515b72

View File

@ -51,6 +51,7 @@ rust_abi() {
riscv64*gnu) echo riscv64gc-unknown-linux-gnu;; riscv64*gnu) echo riscv64gc-unknown-linux-gnu;;
riscv64*musl) echo riscv64gc-unknown-linux-musl;; riscv64*musl) echo riscv64gc-unknown-linux-musl;;
s390x*) echo s390x-unknown-linux-gnu;; s390x*) echo s390x-unknown-linux-gnu;;
sparc64*gnu) echo sparc64-unknown-linux-gnu;;
x86_64*gnu) echo x86_64-unknown-linux-gnu;; x86_64*gnu) echo x86_64-unknown-linux-gnu;;
x86_64*musl) echo x86_64-unknown-linux-musl;; x86_64*musl) echo x86_64-unknown-linux-musl;;
*) echo ${CTARGET};; *) echo ${CTARGET};;
@ -91,29 +92,27 @@ rust_arch_uri() {
rust_all_arch_uris() rust_all_arch_uris()
{ {
echo " echo "
abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) abi_x86_32? ( elibc_glibc? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) )
abi_x86_64? ( abi_x86_64? (
elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") )
elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") )
) )
arm? ( arm? ( elibc_glibc? (
$(rust_arch_uri arm-unknown-linux-gnueabi "$@") $(rust_arch_uri arm-unknown-linux-gnueabi "$@")
$(rust_arch_uri arm-unknown-linux-gnueabihf "$@") $(rust_arch_uri arm-unknown-linux-gnueabihf "$@")
$(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@")
) ) )
arm64? ( arm64? (
elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) elibc_glibc? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") )
elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") ) elibc_musl? ( $(rust_arch_uri aarch64-unknown-linux-musl "$@") )
) )
ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) ppc? ( elibc_glibc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) )
ppc64? ( ppc64? (
big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) )
!big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) !big-endian? ( elibc_glibc? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) )
) )
riscv? ( riscv? ( elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) )
elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) s390? ( elibc_glibc? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) )
)
s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") )
" "
# Upstream did not gain support for loong until v1.71.0. # Upstream did not gain support for loong until v1.71.0.
@ -122,7 +121,7 @@ rust_all_arch_uris()
local arg_version="${1##*-}" local arg_version="${1##*-}"
arg_version="${arg_version:-$PV}" arg_version="${arg_version:-$PV}"
if ver_test "${arg_version}" -ge 1.71.0; then if ver_test "${arg_version}" -ge 1.71.0; then
echo "loong? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") )" echo "loong? ( elibc_glibc? ( $(rust_arch_uri loongarch64-unknown-linux-gnu "$@") ) )"
fi fi
# until https://github.com/rust-lang/rust/pull/113274 is resolved, there # until https://github.com/rust-lang/rust/pull/113274 is resolved, there