diff options
| author |   stefson <herrtimson@yahoo.de> | 2018-04-27 07:01:43 +0200 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2018-04-27 06:32:31 -0400 |
| commit | 64245e628af8de13c9782c36088a000bd645ada7 (patch) | |
| tree | 9f4560ebfe29a97fa73d3690aea1375bd7628d7f /dev-util | |
| parent | dev-util/cargo: lock http-parser dep for now, until there is static cargo ava... (diff) | |
| download | musl-64245e628af8de13c9782c36088a000bd645ada7.tar.gz musl-64245e628af8de13c9782c36088a000bd645ada7.tar.bz2 musl-64245e628af8de13c9782c36088a000bd645ada7.zip | |
dev-util/cargo: fix CHOST detection for arm and 17.0 profiles
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cargo/cargo-0.22.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/cargo/cargo-0.23.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/cargo/cargo-0.24.0.ebuild | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dev-util/cargo/cargo-0.22.0-r1.ebuild b/dev-util/cargo/cargo-0.22.0-r1.ebuild index db6da091..d1b7509f 100644 --- a/dev-util/cargo/cargo-0.22.0-r1.ebuild +++ b/dev-util/cargo/cargo-0.22.0-r1.ebuild @@ -124,7 +124,7 @@ ws2_32-sys-0.2.1 inherit bash-completion-r1 cargo versionator case "${CHOST}" in - armv7a-hardfloat-*) + armv7a*) CARGOARCH=armv7 ;; arm*) CARGOARCH=arm ;; @@ -135,7 +135,7 @@ case "${CHOST}" in armv7a-hardfloat-*) CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; arm*) - CARGOLIBC=${ELIBC/glibc/gnu}eabi ;; + CARGOLIBC=${CHOST##*-} ;; *) CARGOLIBC=${ELIBC/glibc/gnu} ;; esac diff --git a/dev-util/cargo/cargo-0.23.0.ebuild b/dev-util/cargo/cargo-0.23.0.ebuild index 73a3fe3c..e2239130 100644 --- a/dev-util/cargo/cargo-0.23.0.ebuild +++ b/dev-util/cargo/cargo-0.23.0.ebuild @@ -131,7 +131,7 @@ ws2_32-sys-0.2.1 inherit bash-completion-r1 cargo versionator case "${CHOST}" in - armv7a-hardfloat-*) + armv7a*) CARGOARCH=armv7 ;; arm*) CARGOARCH=arm ;; @@ -142,7 +142,7 @@ case "${CHOST}" in armv7a-hardfloat-*) CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; arm*) - CARGOLIBC=${ELIBC/glibc/gnu}eabi ;; + CARGOLIBC=${CHOST##*-} ;; *) CARGOLIBC=${ELIBC/glibc/gnu} ;; esac diff --git a/dev-util/cargo/cargo-0.24.0.ebuild b/dev-util/cargo/cargo-0.24.0.ebuild index 89f6a7ff..14d6057f 100644 --- a/dev-util/cargo/cargo-0.24.0.ebuild +++ b/dev-util/cargo/cargo-0.24.0.ebuild @@ -135,7 +135,7 @@ ws2_32-sys-0.2.1 inherit bash-completion-r1 cargo versionator case "${CHOST}" in - armv7a-hardfloat-*) + armv7a*) CARGOARCH=armv7 ;; arm*) CARGOARCH=arm ;; @@ -146,7 +146,7 @@ case "${CHOST}" in armv7a-hardfloat-*) CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; arm*) - CARGOLIBC=${ELIBC/glibc/gnu}eabi ;; + CARGOLIBC=${CHOST##*-} ;; *) CARGOLIBC=${ELIBC/glibc/gnu} ;; esac |