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

[Sam James]

commit:     23575e7311a21db0aa2dac9b29c5baa4f172658d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 01:49:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 01:57:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23575e73

toolchain.eclass: small ada-bootstrap tweaks

* Don't try to do a PATH lookup for the wrappers for now; need to install
  more symlinks in ada-bootstrap, I think
* Style tweaks

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

 eclass/toolchain.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7a67951fb7ab..355d5e12b4b5 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -983,17 +983,18 @@ toolchain_setup_ada() {
        local tool
        for tool in gnat{,bind,chop,clean,kr,link,ls,make,name,prep} ; do
                if [[ ${ada_bootstrap_type} == ada-bootstrap ]] ; then
-                       ln -s "${BROOT}"/usr/lib/ada-bootstrap/bin/${tool} 
"${T}"/ada-wrappers/${CBUILD}-${tool}-${ada_bootstrap} || die
+                       ln -s "${BROOT}"/usr/lib/ada-bootstrap/bin/${tool} \
+                               
"${T}"/ada-wrappers/${CBUILD}-${tool}-${ada_bootstrap} || die
                fi
 
                cat <<-EOF > "${T}"/ada-wrappers/${tool} || die
-                       #!/bin/sh
-                       exec $(type -P ${CBUILD}-${tool}-${ada_bootstrap}) 
-specs=${T}/ada.spec "\$@"
-                       EOF
-               chmod +x "${T}"/ada-wrappers/${tool} || die
+               #!/bin/sh
+               exec ${CBUILD}-${tool}-${ada_bootstrap} --specs=${T}/ada.spec 
"\$@"
+               EOF
 
                export "${tool^^}"="${T}"/ada-wrappers/${tool}
        done
+       chmod +x 
"${T}"/ada-wrappers/gnat{,bind,chop,clean,kr,link,ls,make,name,prep} || die
 
        export PATH="${T}/ada-wrappers:${old_path}"
        export CC="$(tc-getCC) -specs=${T}/ada.spec"