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:05:49 +0100
commit81551871b183f802ce3c1d0c8fb16479d9671a04 (patch)
tree1f58960c089a719b5f233fa29f02c71da8909f35
parent9718c2d3fbb3281274af4556b34b7bac21fc7774 (diff)
downloadopenembedded-core-contrib-81551871b183f802ce3c1d0c8fb16479d9671a04.tar.gz
openembedded-core-contrib-81551871b183f802ce3c1d0c8fb16479d9671a04.tar.bz2
openembedded-core-contrib-81551871b183f802ce3c1d0c8fb16479d9671a04.zip
gcc: Remove Java support variables
Java support was removed in upstream gcc 7. 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}"
# Language Overrides
FORTRAN = ""
-JAVA = ""
LTO = "--enable-lto"
SSP ?= "--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
#
# These can be overridden by the version specific .inc file.
-# Java (gcj doesn't work on all architectures)
-JAVA ?= ",java"
-JAVA_arm ?= ""
-JAVA_armeb ?= ""
-JAVA_mipsel ?= ""
-JAVA_sh3 ?= ""
# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
FORTRAN ?= ",f77"
-LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
+LANGUAGES ?= "c,c++${FORTRAN}"
EXTRA_OECONF_BASE ?= ""
EXTRA_OECONF_PATHS ?= ""