diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2019-08-21 23:33:21 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2019-08-21 23:33:21 +0100 |
| commit | 578b05904e4db05655b7f7cf033847c68cf8ace3 (patch) | |
| tree | 198c0f48afdf1ac1dc02c03f2e89b8478529baba /eclass | |
| parent | dev-libs/openssl: fix USE=bindist (diff) | |
| download | gentoo-578b05904e4db05655b7f7cf033847c68cf8ace3.tar.gz gentoo-578b05904e4db05655b7f7cf033847c68cf8ace3.tar.bz2 gentoo-578b05904e4db05655b7f7cf033847c68cf8ace3.zip | |
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>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 06503b28f29b..e8fa4d69412b 100644 --- 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 |