| 1 |
commit: 766c642811b87c5cead817a597cf79efcdf0c405 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 25 02:28:50 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 25 06:05:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766c6428 |
| 7 |
|
| 8 |
eclass/rust-toolchain.eclass: add multilib support on amd64 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/701362 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/rust-toolchain.eclass | 28 ++++++++++++++-------------- |
| 14 |
1 file changed, 14 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass |
| 17 |
index 66266a5b544..9d7360ed1c4 100644 |
| 18 |
--- a/eclass/rust-toolchain.eclass |
| 19 |
+++ b/eclass/rust-toolchain.eclass |
| 20 |
@@ -104,19 +104,19 @@ rust_arch_uri() { |
| 21 |
rust_all_arch_uris() |
| 22 |
{ |
| 23 |
local uris="" |
| 24 |
- uris+="amd64? ( elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) |
| 25 |
- elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) ) " |
| 26 |
- uris+="arm? ( $(rust_arch_uri arm-unknown-linux-gnueabi "$@") |
| 27 |
- $(rust_arch_uri arm-unknown-linux-gnueabihf "$@") |
| 28 |
- $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") ) " |
| 29 |
- uris+="arm64? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) " |
| 30 |
- uris+="mips? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") |
| 31 |
- $(rust_arch_uri mipsel-unknown-linux-gnu "$@") |
| 32 |
- $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) " |
| 33 |
- uris+="ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) " |
| 34 |
- uris+="ppc64? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") |
| 35 |
- $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) " |
| 36 |
- uris+="s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) " |
| 37 |
- uris+="x86? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) " |
| 38 |
+ uris+="abi_x86_64? ( elibc_glibc? ( $(rust_arch_uri x86_64-unknown-linux-gnu "$@") ) |
| 39 |
+ elibc_musl? ( $(rust_arch_uri x86_64-unknown-linux-musl "$@") ) ) " |
| 40 |
+ uris+="arm? ( $(rust_arch_uri arm-unknown-linux-gnueabi "$@") |
| 41 |
+ $(rust_arch_uri arm-unknown-linux-gnueabihf "$@") |
| 42 |
+ $(rust_arch_uri armv7-unknown-linux-gnueabihf "$@") ) " |
| 43 |
+ uris+="arm64? ( $(rust_arch_uri aarch64-unknown-linux-gnu "$@") ) " |
| 44 |
+ uris+="mips? ( $(rust_arch_uri mips-unknown-linux-gnu "$@") |
| 45 |
+ $(rust_arch_uri mipsel-unknown-linux-gnu "$@") |
| 46 |
+ $(rust_arch_uri mips64-unknown-linux-gnuabi64 "$@") ) " |
| 47 |
+ uris+="ppc? ( $(rust_arch_uri powerpc-unknown-linux-gnu "$@") ) " |
| 48 |
+ uris+="ppc64? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") |
| 49 |
+ $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) " |
| 50 |
+ uris+="s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) " |
| 51 |
+ uris+="abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu "$@") ) " |
| 52 |
echo "${uris}" |
| 53 |
} |
Archives