commit:     d2f7c8c1e90dd39818c8a810c57c9b15f96ffbe0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 20:15:41 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 20:16:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f7c8c1

toolchain.eclass: set SLOT=${GCCMAJOR} for gcc-10*

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 eclass/toolchain.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7e88900737a..d2bfa6ab2f1 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -186,7 +186,13 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
        tc_version_is_at_least 9.1 && IUSE+=" lto"
 fi
 
-SLOT="${GCC_CONFIG_VER}"
+if tc_version_is_at_least 10; then
+       # Note: currently we pull in prereleases, snapshots and
+       # git versions into the same SLOT.
+       SLOT="${GCCMAJOR}"
+else
+       SLOT="${GCC_CONFIG_VER}"
+fi
 
 #---->> DEPEND <<----
 

Reply via email to