summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-04-13 09:19:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commit258f485e09d45eadf5aec32664cf393929741825 (patch)
treec510a2a565c2c8dde94a0d6f8fc467dd040d7a9c
parentef0654f1453ff0afe98d7e921626b2a96cf2f6f6 (diff)
downloadpoky-258f485e09d45eadf5aec32664cf393929741825.tar.gz
gcc: Remove Java support variables
Java support was removed in upstream gcc 7. (From OE-Core rev: 81551871b183f802ce3c1d0c8fb16479d9671a04) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-8.3.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc8
2 files changed, 1 insertions, 8 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-8.3.inc b/meta/recipes-devtools/gcc/gcc-8.3.inc
index f7bf257fa6..88a9df2049 100644
--- a/meta/recipes-devtools/gcc/gcc-8.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-8.3.inc
@@ -82,7 +82,6 @@ B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
82 82
83# Language Overrides 83# Language Overrides
84FORTRAN = "" 84FORTRAN = ""
85JAVA = ""
86 85
87LTO = "--enable-lto" 86LTO = "--enable-lto"
88SSP ?= "--disable-libssp" 87SSP ?= "--disable-libssp"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 375c5e90c9..b6f2ca541d 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -5,15 +5,9 @@ require gcc-shared-source.inc
5# 5#
6# These can be overridden by the version specific .inc file. 6# These can be overridden by the version specific .inc file.
7 7
8# Java (gcj doesn't work on all architectures)
9JAVA ?= ",java"
10JAVA_arm ?= ""
11JAVA_armeb ?= ""
12JAVA_mipsel ?= ""
13JAVA_sh3 ?= ""
14# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' 8# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
15FORTRAN ?= ",f77" 9FORTRAN ?= ",f77"
16LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" 10LANGUAGES ?= "c,c++${FORTRAN}"
17 11
18EXTRA_OECONF_BASE ?= "" 12EXTRA_OECONF_BASE ?= ""
19EXTRA_OECONF_PATHS ?= "" 13EXTRA_OECONF_PATHS ?= ""