[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sergei Trofimovich]

commit:     7faed09083a9e8c406ddd14cf663bf9229b88d88
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 18:52:42 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 20:42:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7faed090

toolchain.eclass: always validate gcc/BASE-VER (assume >=gcc-4.1)

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

 eclass/toolchain.eclass | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b205aeccb5c..4d08574228d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -474,12 +474,10 @@ toolchain_src_prepare() {
        setup_multilib_osdirnames
        gcc_version_patch
 
-       if tc_version_is_at_least 4.1 ; then
-               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}'"
-                       die "Please set 'TOOLCHAIN_GCC_PV' to 
'${actual_version}'"
-               fi
+       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}'"
+               die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'"
        fi
 
        # >= gcc-4.3 doesn't bundle ecj.jar, so copy it