summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-04-24 19:28:50 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-04-24 23:05:50 -0700
commit766c642811b87c5cead817a597cf79efcdf0c405 (patch)
treedb6bc73ad5e72afa6aef9d661b9ff3effb70be59 /eclass/rust-toolchain.eclass
parentsci-libs/trilinos: fix installation (diff)
downloadgentoo-766c642811b87c5cead817a597cf79efcdf0c405.tar.gz
gentoo-766c642811b87c5cead817a597cf79efcdf0c405.tar.bz2
gentoo-766c642811b87c5cead817a597cf79efcdf0c405.zip
eclass/rust-toolchain.eclass: add multilib support on amd64
Bug: https://bugs.gentoo.org/701362 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'eclass/rust-toolchain.eclass')
-rw-r--r--eclass/rust-toolchain.eclass28
1 files changed, 14 insertions, 14 deletions
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 66266a5b544..9d7360ed1c4 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -104,19 +104,19 @@ rust_arch_uri() {
rust_all_arch_uris()
{
local uris=""
- 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 "$@") ) "
- uris+="arm64? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) "
- uris+="mips? ( $(rust_arch_uri mips-unknown-linux-gnu "$@")
- $(rust_arch_uri mipsel-unknown-linux-gnu "$@")
- $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) "
- uris+="ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) "
- uris+="ppc64? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@")
- $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) "
- uris+="s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) "
- uris+="x86? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) "
+ uris+="abi_x86_64? ( 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 "$@") ) "
+ uris+="arm64? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) "
+ uris+="mips? ( $(rust_arch_uri mips-unknown-linux-gnu "$@")
+ $(rust_arch_uri mipsel-unknown-linux-gnu "$@")
+ $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) "
+ uris+="ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) "
+ uris+="ppc64? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@")
+ $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) "
+ uris+="s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) "
+ uris+="abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) "
echo "${uris}"
}