diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /eclass/rust-toolchain.eclass | |
parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) |
gentoo resync : 05.02.2020
Diffstat (limited to 'eclass/rust-toolchain.eclass')
-rw-r--r-- | eclass/rust-toolchain.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 304ee9052457..5126fb96a89d 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 "$@") ) " |