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

[Alfredo Tupone]

commit:     9ed226fa5c2394948ac9b3c6518a470f43c42814
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:33:57 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 07:33:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed226fa

ada.eclass: add export of GNAT

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 eclass/ada.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index aae30562074..763ce92056e 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -222,6 +222,10 @@ ada_export() {
                                export GCC_PV=${gcc_pv}
                                debug-print "${FUNCNAME}: GCC_PV = ${GCC_PV}"
                                ;;
+                       GNAT)
+                               export GNAT=${EPREFIX}/usr/bin/gnat-${gcc_pv}
+                               debug-print "${FUNCNAME}: GNAT = ${GNAT}"
+                               ;;
                        GNATBIND)
                                export 
GNATBIND=${EPREFIX}/usr/bin/gnatbind-${gcc_pv}
                                debug-print "${FUNCNAME}: GNATBIND = 
${GNATBIND}"
@@ -407,7 +411,7 @@ ada_setup() {
        if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
                if use "ada_target_${_ADA_SUPPORTED_IMPLS[0]}"; then
                        # Only one supported implementation, enable it 
explicitly
-                       ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV
+                       ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV GNAT
                        ada_wrapper_setup
                fi
        else
@@ -423,7 +427,7 @@ ada_setup() {
                                        die "More than one implementation in 
ADA_TARGET."
                                fi
 
-                               ada_export "${impl}" EADA GCC GCC_PV GNATMAKE
+                               ada_export "${impl}" EADA GCC_PV GNAT
                                ada_wrapper_setup
                        fi
                done