[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     9cfe1db9d69d0363f7591734822d4ba527d538fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 02:17:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 02:17:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfe1db9

toolchain.eclass: consolidate language configure options

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 41f51b1bb747..9900b2989abf 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1022,18 +1022,6 @@ toolchain_src_configure() {
        fi
        [[ -n ${CBUILD} ]] && confgcc+=( --build=${CBUILD} )
 
-       _need_ada_bootstrap_mangling() {
-               if [[ ${CATEGORY}/${PN} == dev-lang/gnat-gpl ]] ; then
-                       _tc_use_if_iuse system-bootstrap && return 0
-                       return 1
-               fi
-
-               _tc_use_if_iuse ada
-       }
-
-       _need_ada_bootstrap_mangling && toolchain_setup_ada
-       _tc_use_if_iuse d && toolchain_setup_d
-
        confgcc+=(
                --prefix="${PREFIX}"
                --bindir="${BINPATH}"
@@ -1088,6 +1076,18 @@ toolchain_src_configure() {
        is_modula2 && GCC_LANG+=",m2"
        is_rust && GCC_LANG+=",rust"
 
+       _need_ada_bootstrap_mangling() {
+               if [[ ${CATEGORY}/${PN} == dev-lang/gnat-gpl ]] ; then
+                       _tc_use_if_iuse system-bootstrap && return 0
+                       return 1
+               fi
+
+               _tc_use_if_iuse ada
+       }
+
+       _need_ada_bootstrap_mangling && toolchain_setup_ada
+       _tc_use_if_iuse d && toolchain_setup_d
+
        confgcc+=( --enable-languages=${GCC_LANG} )
 
        ### general options