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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4D3B1581EC for ; Wed, 20 Nov 2024 12:37:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA64AE07D0; Wed, 20 Nov 2024 12:37:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 AC6B7E07D0 for ; Wed, 20 Nov 2024 12:37:16 +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 AE523335DCD for ; Wed, 20 Nov 2024 12:37:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 118E5D81 for ; Wed, 20 Nov 2024 12:37:14 +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: <1732106168.839a158bb5efbf454e09414e96cd7716a2550f31.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: 839a158bb5efbf454e09414e96cd7716a2550f31 X-VCS-Branch: master Date: Wed, 20 Nov 2024 12:37:14 +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: 3c1eb176-e4c1-424c-ab94-b7082422d286 X-Archives-Hash: bfefaeb52c62bfe8bf6d9b01688e2ed6 commit: 839a158bb5efbf454e09414e96cd7716a2550f31 Author: Sam James gentoo org> AuthorDate: Wed Nov 20 12:36:08 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 20 12:36:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839a158b toolchain.eclass: revert Ada changes for now I need to do some more. Revert my earlier changes for now. Reverts: 97069fd8721ea55980e548b9cf1d55e2a234a514 Reverts: 0a0b2fe6aadb9d0c3b41fdabb21535659c839bf5 Reverts: 1b5d47858780c700e706582aa370a69148552055 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 8178a7b837b2..02db921ce133 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -956,10 +956,10 @@ toolchain_setup_ada() { case ${ada_bootstrap_type} in ada-bootstrap) export PATH="${BROOT}/usr/lib/ada-bootstrap/bin:${PATH}" - gnat1_path=${BROOT}/usr/lib/ada-bootstrap/libexec/gcc/${CHOST}/${ada_bootstrap}/gnat1 + gnat1_path=${BROOT}/usr/lib/ada-bootstrap/libexec/gcc/${CBUILD}/${ada_bootstrap}/gnat1 ;; *) - gnat1_path=${BROOT}/usr/libexec/gcc/${CHOST}/${ada_bootstrap}/gnat1 + gnat1_path=${BROOT}/usr/libexec/gcc/${CBUILD}/${ada_bootstrap}/gnat1 ;; esac @@ -976,7 +976,7 @@ toolchain_setup_ada() { # work for us as the stage1 compiler doesn't necessarily have Ada # support. Substitute the Ada compiler we found earlier. local adalib - adalib=$(${CHOST}-gcc-${ada_bootstrap} -print-libgcc-file-name || die "Finding adalib dir failed") + adalib=$(${CBUILD}-gcc-${ada_bootstrap} -print-libgcc-file-name || die "Finding adalib dir failed") adalib="${adalib%/*}/adalib" sed -i \ -e "s:adalib=.*:adalib=${adalib}:" \ @@ -989,7 +989,7 @@ toolchain_setup_ada() { for tool in gnat{,bind,chop,clean,kr,link,ls,make,name,prep} ; do cat <<-EOF > "${T}"/ada-wrappers/${tool} || die #!/bin/sh - exec $(type -P ${CHOST}-${tool}-${ada_bootstrap}) "\$@" + exec $(type -P ${CBUILD}-${tool}-${ada_bootstrap}) "\$@" EOF export "${tool^^}"="${T}"/ada-wrappers/${tool}