---
gx86/eclass/autotools-multilib.eclass | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/gx86/eclass/autotools-multilib.eclass
b/gx86/eclass/autotools-multilib.eclass
index 5ecbd2f..55d32d7 100644
--- a/gx86/eclass/autotools-multilib.eclass
+++ b/gx86/eclass/autotools-multilib.eclass
@@ -102,33 +102,20 @@ _autotools-multilib_wrap_headers() {
#if defined(__x86_64__) /* amd64 */
# if defined(__ILP32__) /* x32 ABI */
-# error "abi_x86_x32 not supported by the package."
+# error "x86_x32 not supported by the package."
# else /* 64-bit ABI */
-# error "abi_x86_64 not supported by the package."
+# error "x86_64 not supported by the package."
# endif
#elif defined(__i386__) /* plain x86 */
-# error "abi_x86_32 not supported by the package."
+# error "x86_32 not supported by the package."
#else
# error "No ABI matched, please report a bug to bugs.gentoo.org"
#endif
_EOF_
fi
- # XXX: get abi_* directly
- local abi_flag
- case "${ABI}" in
- amd64)
- abi_flag=abi_x86_64;;
- x86)
- abi_flag=abi_x86_32;;
- x32)
- abi_flag=abi_x86_x32;;
- *)
- die "Header wrapping for ${ABI} not supported
yet";;
- esac
-
# Note: match a space afterwards to avoid collision potential.
- sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \
+ sed -e "/${MULTILIB_ABI} /s&error.*&include <${CHOST}/${f}>&" \
-i "${ED}/tmp/multilib-include${f}" || die
done
}
--
1.8.1.5
