@@ -, +, @@ 
---
 sys-libs/musl/musl-1.1.24.ebuild | 6 +++++-
 sys-libs/musl/musl-1.2.0.ebuild  | 6 +++++-
 sys-libs/musl/musl-9999.ebuild   | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
--- a/sys-libs/musl/musl-1.1.24.ebuild	
+++ a/sys-libs/musl/musl-1.1.24.ebuild	
@@ -98,7 +98,11 @@ src_install() {
 	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
 	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		case ${CTARGET} in
+			arm*-*-linux-musleabihf)  arch="armhf" ;;
+			i686-*-linux-musl)   arch="i386" ;;
+			*) arch=${CHOST%%-*} ;;
+		esac
 		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
 		cp "${FILESDIR}"/ldconfig.in "${T}" || die
 		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
--- a/sys-libs/musl/musl-1.2.0.ebuild	
+++ a/sys-libs/musl/musl-1.2.0.ebuild	
@@ -98,7 +98,11 @@ src_install() {
 	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
 	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		case ${CTARGET} in
+			arm*-*-linux-musleabihf)  arch="armhf" ;;
+			i686-*-linux-musl)   arch="i386" ;;
+			*) arch=${CHOST%%-*} ;;
+		esac
 		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
 		cp "${FILESDIR}"/ldconfig.in "${T}" || die
 		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
--- a/sys-libs/musl/musl-9999.ebuild	
+++ a/sys-libs/musl/musl-9999.ebuild	
@@ -98,7 +98,11 @@ src_install() {
 	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
 	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		case ${CTARGET} in
+			arm*-*-linux-musleabihf)  arch="armhf" ;;
+			i686-*-linux-musl)   arch="i386" ;;
+			*) arch=${CHOST%%-*} ;;
+		esac
 		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
 		cp "${FILESDIR}"/ldconfig.in "${T}" || die
 		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
--