toolchain.eclass: Fix gcj's automagic dependency on dev-java/antlr

Closes: https://bugs.gentoo.org/552882
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 06503b28f29b8879450cec3fa12cd3b3e0c1d592..e8fa4d69412baf989c30aa02b04de81b802b9f42 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1238,10 +1238,11 @@ toolchain_src_configure() {
        ### library options
 
        if tc_version_is_between 3.0 7.0 ; then
-               if ! is_gcj ; then
+               if is_gcj ; then
+                       confgcc+=( --disable-gjdoc )
+                       use awt && confgcc+=( --enable-java-awt=gtk )
+               else
                        confgcc+=( --disable-libgcj )
-               elif use awt ; then
-                       confgcc+=( --enable-java-awt=gtk )
                fi
        fi