diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-06-04 20:43:09 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-09 17:43:41 +0100 |
commit | 18ec179172b491df40937da6de88f7b842428ec8 (patch) | |
tree | 7afd76b1c3559a712171852665a7cf61f54d72ed | |
parent | 3521e0b8634040e2da94380e19c23db90363fdd4 (diff) | |
download | poky-18ec179172b491df40937da6de88f7b842428ec8.tar.gz |
gcc: Turn FORTRAN into a weak assignment
This ensures that it can be turned on from a distro layer
config metadata e.g. local.conf without forcing overrides
currently we have do something like
FORTRAN:forcevariable = ",fortran"
RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath "
TOOLCHAIN_TARGET_TASK:append = " gfortran"
to enabled fortran support from distro conf file.
After this change we can do it with
FORTRAN = ",fortran"
RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath "
TOOLCHAIN_TARGET_TASK:append = " gfortran"
(From OE-Core rev: 50abae55eda0115d073bbc6552f2fcb4ecbb7949)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-15.1.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-15.1.inc b/meta/recipes-devtools/gcc/gcc-15.1.inc index 0032500cdc..18f8cae5ca 100644 --- a/meta/recipes-devtools/gcc/gcc-15.1.inc +++ b/meta/recipes-devtools/gcc/gcc-15.1.inc | |||
@@ -79,7 +79,7 @@ S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" | |||
79 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 79 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" |
80 | 80 | ||
81 | # Language Overrides | 81 | # Language Overrides |
82 | FORTRAN = "" | 82 | FORTRAN ?= "" |
83 | 83 | ||
84 | SSP ?= "--disable-libssp" | 84 | SSP ?= "--disable-libssp" |
85 | SSP:mingw32 = "--enable-libssp" | 85 | SSP:mingw32 = "--enable-libssp" |
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 5c79936242..e3fb48c030 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc | |||
@@ -6,7 +6,7 @@ require gcc-shared-source.inc | |||
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 | # 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' |
9 | FORTRAN ?= ",fortran" | 9 | FORTRAN ??= ",fortran" |
10 | LANGUAGES ?= "c,c++${FORTRAN}" | 10 | LANGUAGES ?= "c,c++${FORTRAN}" |
11 | 11 | ||
12 | EXTRA_OECONF_BASE ?= "" | 12 | EXTRA_OECONF_BASE ?= "" |