summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-14 17:00:35 +0000
committerMike Frysinger <vapier@gentoo.org>2012-04-14 17:00:35 +0000
commitd40dd4825c5e88f5e3c7c741613eb0b4f18af55e (patch)
tree77bf801526a7a6f57276b2fce535d08d5c31eddc /eclass
parentAdd ~amd64-linux keyword. (diff)
downloadhistorical-d40dd4825c5e88f5e3c7c741613eb0b4f18af55e.tar.gz
historical-d40dd4825c5e88f5e3c7c741613eb0b4f18af55e.tar.bz2
historical-d40dd4825c5e88f5e3c7c741613eb0b4f18af55e.zip
simplify SLOT logic a bit by dropping CTARGET as we no longer need it -- we have CATEGORY=cross-${CTARGET} to keep things unique
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass6
1 files changed, 2 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b5c0aa00cdb7..7eec040fd522 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.532 2012/03/22 06:07:08 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.533 2012/04/14 17:00:35 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -117,9 +117,7 @@ fi
# Support upgrade paths here or people get pissed
if use multislot ; then
- SLOT="${CTARGET}-${GCC_CONFIG_VER}"
-elif is_crosscompile; then
- SLOT="${CTARGET}-${GCC_BRANCH_VER}"
+ SLOT="${GCC_CONFIG_VER}"
else
SLOT="${GCC_BRANCH_VER}"
fi