summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-05-09 07:13:47 +0000
committerMichał Górny <mgorny@gentoo.org>2014-05-09 07:13:47 +0000
commit9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3 (patch)
tree4e895aac712dcde2b1a47afde135983164511ef3 /eclass/emul-linux-x86.eclass
parentUpdate remove-native wrt library name changes. (diff)
downloadgentoo-2-9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3.tar.gz
gentoo-2-9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3.tar.bz2
gentoo-2-9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3.zip
Remove i686-* renamed tools as well with USE=abi_x86_32.
Diffstat (limited to 'eclass/emul-linux-x86.eclass')
-rw-r--r--eclass/emul-linux-x86.eclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass
index 3d7d66b1ed3c..784a69dc7ce7 100644
--- a/eclass/emul-linux-x86.eclass
+++ b/eclass/emul-linux-x86.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.23 2014/05/09 06:51:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.24 2014/05/09 07:13:47 mgorny Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -8,7 +8,7 @@
# Purpose: Providing a template for the app-emulation/emul-linux-* packages
#
-inherit multilib
+inherit eutils multilib
case "${EAPI:-0}" in
3|4|5)
@@ -89,4 +89,8 @@ emul-linux-x86_src_install() {
if [[ -d "${D}"/usr/include ]] && use abi_x86_32; then
rm -r "${D}"/usr/include || die
fi
+ # The same goes for ${CHOST}- multilib tool prefixing.
+ if path_exists "${D}"/usr/bin/i686-pc-linux-gnu-* && use abi_x86_32; then
+ rm "${D}"/usr/bin/i686-pc-linux-gnu-* || die
+ fi
}