diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-10-02 20:55:01 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-10-02 20:55:01 -0400 |
| commit | 9cfef505387b4bfce445217fd96fcd67a3f3b57d (patch) | |
| tree | c1d0c5cbd3132948b8a14b30698788b39967887a | |
| parent | 63aaad8e00aa40326e1f65d009ef75e605ebd46d (diff) | |
| download | gentoo-9cfef505387b4bfce445217fd96fcd67a3f3b57d.tar.gz gentoo-9cfef505387b4bfce445217fd96fcd67a3f3b57d.tar.xz | |
toolchain.eclass: change SLOT to major version for gcc-5+ #555164
| -rw-r--r-- | eclass/toolchain.eclass | 5 |
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 <<---- |