diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-04-13 09:19:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:10:02 +0100 |
commit | 258f485e09d45eadf5aec32664cf393929741825 (patch) | |
tree | c510a2a565c2c8dde94a0d6f8fc467dd040d7a9c /meta/recipes-devtools/gcc | |
parent | ef0654f1453ff0afe98d7e921626b2a96cf2f6f6 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-8.3.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 8 |
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 |
84 | FORTRAN = "" | 84 | FORTRAN = "" |
85 | JAVA = "" | ||
86 | 85 | ||
87 | LTO = "--enable-lto" | 86 | LTO = "--enable-lto" |
88 | SSP ?= "--disable-libssp" | 87 | 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 | |||
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) | ||
9 | JAVA ?= ",java" | ||
10 | JAVA_arm ?= "" | ||
11 | JAVA_armeb ?= "" | ||
12 | JAVA_mipsel ?= "" | ||
13 | JAVA_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' |
15 | FORTRAN ?= ",f77" | 9 | FORTRAN ?= ",f77" |
16 | LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" | 10 | LANGUAGES ?= "c,c++${FORTRAN}" |
17 | 11 | ||
18 | EXTRA_OECONF_BASE ?= "" | 12 | EXTRA_OECONF_BASE ?= "" |
19 | EXTRA_OECONF_PATHS ?= "" | 13 | EXTRA_OECONF_PATHS ?= "" |