From 335cd9e205e69ad8afebe8b75815c2d9ce2c1374 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 2 Jul 2018 00:17:04 +0200 Subject: [PATCH] toolchain.eclass: Do not pass unused --disable-libgcj option in GCC >=7. Closes: https://bugs.gentoo.org/659798 Signed-off-by: Sergei Trofimovich --- eclass/toolchain.eclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 68e4ce15b377..d80889d1ba64 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 -- 2.26.2