summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/toolchain.eclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b81dbb004cd..d0bc068df34 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -160,8 +160,11 @@ IUSE+=" ${IUSE_DEF[*]/#/+}"
# Support upgrade paths here or people get pissed
if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
SLOT="${GCC_CONFIG_VER}"
-else
+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
#---->> DEPEND <<----