commit:     66666c48e0856461169819b1f23a551077bb5a15
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 12:02:18 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 12:06:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66666c48

toolchain.eclass: assert GCC_RELEASE_VER to match gcc/BASE-VER

Bug: https://bugs.gentoo.org/706588
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 eclass/toolchain.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index e280ee07eb6..71c3cbc8c76 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -536,9 +536,7 @@ toolchain_src_prepare() {
                local actual_version=$(< "${S}"/gcc/BASE-VER)
                if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then
                        eerror "'${S}/gcc/BASE-VER' contains 
'${actual_version}', expected '${GCC_RELEASE_VER}'"
-                       # TODO: once ada ebuilds are fixed turn it to 'die'
-                       eerror "Please set GCC_RELEASE_VER to 
'${actual_version}'"
-                       echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER
+                       die "Please set 'TOOLCHAIN_GCC_PV' to 
'${actual_version}'"
                fi
        fi
 

Reply via email to