| 1 |
commit: 7faed09083a9e8c406ddd14cf663bf9229b88d88 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 31 18:52:42 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 31 20:42:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7faed090 |
| 7 |
|
| 8 |
toolchain.eclass: always validate gcc/BASE-VER (assume >=gcc-4.1) |
| 9 |
|
| 10 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/toolchain.eclass | 10 ++++------ |
| 13 |
1 file changed, 4 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 16 |
index b205aeccb5c..4d08574228d 100644 |
| 17 |
--- a/eclass/toolchain.eclass |
| 18 |
+++ b/eclass/toolchain.eclass |
| 19 |
@@ -474,12 +474,10 @@ toolchain_src_prepare() { |
| 20 |
setup_multilib_osdirnames |
| 21 |
gcc_version_patch |
| 22 |
|
| 23 |
- if tc_version_is_at_least 4.1 ; then |
| 24 |
- local actual_version=$(< "${S}"/gcc/BASE-VER) |
| 25 |
- if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then |
| 26 |
- eerror "'${S}/gcc/BASE-VER' contains '${actual_version}', expected '${GCC_RELEASE_VER}'" |
| 27 |
- die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'" |
| 28 |
- fi |
| 29 |
+ local actual_version=$(< "${S}"/gcc/BASE-VER) |
| 30 |
+ if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then |
| 31 |
+ eerror "'${S}/gcc/BASE-VER' contains '${actual_version}', expected '${GCC_RELEASE_VER}'" |
| 32 |
+ die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'" |
| 33 |
fi |
| 34 |
|
| 35 |
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it |
Archives