commit:     335cd9e205e69ad8afebe8b75815c2d9ce2c1374
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Jul  1 22:17:04 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 22:40:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335cd9e2

toolchain.eclass: Do not pass unused --disable-libgcj option in GCC >=7.

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

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

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 68e4ce15b37..d80889d1ba6 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1175,10 +1175,12 @@ toolchain_src_configure() {
 
        ### library options
 
-       if ! is_gcj ; then
-               confgcc+=( --disable-libgcj )
-       elif use awt ; then
-               confgcc+=( --enable-java-awt=gtk )
+       if tc_version_is_between 3.0 7.0 ; then
+               if ! is_gcj ; then
+                       confgcc+=( --disable-libgcj )
+               elif use awt ; then
+                       confgcc+=( --enable-java-awt=gtk )
+               fi
        fi
 
        if tc_version_is_at_least 4.2 ; then

Reply via email to