diff options
| author |   Sam James <sam@gentoo.org> | 2024-11-20 12:36:08 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-11-20 12:36:08 +0000 |
| commit | 839a158bb5efbf454e09414e96cd7716a2550f31 (patch) | |
| tree | 58dea295a6aec209fec5bcc0080670f925d73c51 /eclass | |
| parent | app-misc/mc: Stabilize 4.8.32-r1 hppa, #940691 (diff) | |
| download | gentoo-839a158bb5efbf454e09414e96cd7716a2550f31.tar.gz gentoo-839a158bb5efbf454e09414e96cd7716a2550f31.tar.bz2 gentoo-839a158bb5efbf454e09414e96cd7716a2550f31.zip | |
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 <sam@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files 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} |