| 1 |
commit: 335cd9e205e69ad8afebe8b75815c2d9ce2c1374 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sun Jul 1 22:17:04 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 1 22:40:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335cd9e2 |
| 7 |
|
| 8 |
toolchain.eclass: Do not pass unused --disable-libgcj option in GCC >=7. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/659798 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/toolchain.eclass | 10 ++++++---- |
| 14 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 17 |
index 68e4ce15b37..d80889d1ba6 100644 |
| 18 |
--- a/eclass/toolchain.eclass |
| 19 |
+++ b/eclass/toolchain.eclass |
| 20 |
@@ -1175,10 +1175,12 @@ toolchain_src_configure() { |
| 21 |
|
| 22 |
### library options |
| 23 |
|
| 24 |
- if ! is_gcj ; then |
| 25 |
- confgcc+=( --disable-libgcj ) |
| 26 |
- elif use awt ; then |
| 27 |
- confgcc+=( --enable-java-awt=gtk ) |
| 28 |
+ if tc_version_is_between 3.0 7.0 ; then |
| 29 |
+ if ! is_gcj ; then |
| 30 |
+ confgcc+=( --disable-libgcj ) |
| 31 |
+ elif use awt ; then |
| 32 |
+ confgcc+=( --enable-java-awt=gtk ) |
| 33 |
+ fi |
| 34 |
fi |
| 35 |
|
| 36 |
if tc_version_is_at_least 4.2 ; then |
Archives