From 258f485e09d45eadf5aec32664cf393929741825 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sat, 13 Apr 2019 09:19:19 +0300 Subject: gcc: Remove Java support variables Java support was removed in upstream gcc 7. (From OE-Core rev: 81551871b183f802ce3c1d0c8fb16479d9671a04) Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-8.3.inc | 1 - meta/recipes-devtools/gcc/gcc-configure-common.inc | 8 +------- 2 files changed, 1 insertion(+), 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 ?= "" -- cgit v1.2.3-54-g00ecf