summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-01-26 20:01:15 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-01-26 20:55:33 +0000
commit6d214f929c974f6c07d44e3a36c212ef3d334287 (patch)
treeb5bb1a76e781a7908fa574f57d830fbc991fefe8 /eclass
parentsys-devel/gcc: match live ebuild version with upstream's (diff)
downloadgentoo-6d214f929c974f6c07d44e3a36c212ef3d334287.tar.gz
gentoo-6d214f929c974f6c07d44e3a36c212ef3d334287.tar.bz2
gentoo-6d214f929c974f6c07d44e3a36c212ef3d334287.zip
toolchain.eclass: don't add _pre suffixes to tools
${GCC_CONFIG_VER} != ${GCC_RELEASE_VER} does not really work today. We don't override enough paths and don't rename tool versions. Let's keep thins simpler and stick to upstream versioning. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 97c9e585723..767240eb7f2 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -73,9 +73,10 @@ GCCMAJOR=$(ver_cut 1 ${GCC_PV})
GCCMINOR=$(ver_cut 2 ${GCC_PV})
GCCMICRO=$(ver_cut 3 ${GCC_PV})
-# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
-# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
-GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(ver_rs 3 '-' ${GCC_PV})}
+# gcc hardcodes it's internal version into gcc/BASE-VER
+# and assumes various directories and tools to have the
+# same name.
+GCC_CONFIG_VER=${GCC_RELEASE_VER}
# Pre-release support. Versioning schema:
# 1.0.0_pre9999: live ebuild