From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0529215808B for ; Mon, 30 Sep 2024 02:20:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38C20E2A37; Mon, 30 Sep 2024 02:20:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23242E2A37 for ; Mon, 30 Sep 2024 02:20:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EC7F3431B9 for ; Mon, 30 Sep 2024 02:20:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4A1F1F30 for ; Mon, 30 Sep 2024 02:20:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1727662670.9cfe1db9d69d0363f7591734822d4ba527d538fd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9cfe1db9d69d0363f7591734822d4ba527d538fd X-VCS-Branch: master Date: Mon, 30 Sep 2024 02:20:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46f5bcf4-4035-4805-a9ca-f9324e325df1 X-Archives-Hash: b8a8e512d29c645f94c7c61b8909184e commit: 9cfe1db9d69d0363f7591734822d4ba527d538fd Author: Sam James gentoo org> AuthorDate: Mon Sep 30 02:17:50 2024 +0000 Commit: Sam James gentoo 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 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