summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-03-12 10:53:42 -0500
committerMike Frysinger <vapier@gentoo.org>2016-03-15 13:56:38 -0400
commit6fd83c0c338e901db4ba47ddb87f523482fedf33 (patch)
treece44e669bac2ea58fcafb9ba94e423a4b540aa4e /eclass/toolchain.eclass
parentdev-perl/Canary-Stability: x86 stable wrt bug #576110 (diff)
downloadgentoo-6fd83c0c338e901db4ba47ddb87f523482fedf33.tar.gz
gentoo-6fd83c0c338e901db4ba47ddb87f523482fedf33.tar.bz2
gentoo-6fd83c0c338e901db4ba47ddb87f523482fedf33.zip
toolchain.eclass: use versioned SLOT all the time
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass10
1 files changed, 1 insertions, 9 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 23b0fa77b3d..7dade5cf192 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -159,15 +159,7 @@ fi
IUSE+=" ${IUSE_DEF[*]/#/+}"
-# Support upgrade paths here or people get pissed
-if ! tc_version_is_at_least 4.8 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
- SLOT="${GCC_CONFIG_VER}"
-elif ! tc_version_is_at_least 5.0 ; then
- SLOT="${GCC_BRANCH_VER}"
-else
- # Upstream changed versioning w/gcc-5+, so SLOT matches major only. #555164
- SLOT="${GCCMAJOR}"
-fi
+SLOT="${GCC_CONFIG_VER}"
#---->> DEPEND <<----