toolchain.eclass: use ${GCC_CONFIG_VER} in snapshot, don't mangle ${PV}
authorSergei Trofimovich <slyfox@gentoo.org>
Sun, 26 Jan 2020 00:05:06 +0000 (00:05 +0000)
committerSergei Trofimovich <slyfox@gentoo.org>
Sun, 26 Jan 2020 00:06:28 +0000 (00:06 +0000)
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
eclass/toolchain.eclass

index aa70a11c410784d44cb6d0002ba8d8ba0b35593e..a535707f7eced50880c585714991ee8fa51f1746 100644 (file)
@@ -569,11 +569,7 @@ toolchain_src_prepare() {
 
        if tc_version_is_at_least 4.1 ; then
                if [[ -n ${SNAPSHOT} ]] || tc_is_live ; then
-                       # followed by an optional -pre string
-                       #   eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999
-                       # If BASE-VER differs from ${PV/_/-} then libraries get installed in
-                       # the wrong directory.
-                       echo ${PV/_/-} > "${S}"/gcc/BASE-VER
+                       echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER
                fi
        fi