ada.eclass: add export of GNAT
authorTupone Alfredo <tupone@gentoo.org>
Tue, 17 Sep 2019 07:33:57 +0000 (09:33 +0200)
committerTupone Alfredo <tupone@gentoo.org>
Tue, 17 Sep 2019 07:33:57 +0000 (09:33 +0200)
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
eclass/ada.eclass

index aae30562074bdc04bce1841fef626365ae2d8ae4..763ce92056e0ae07ae122b09ea86fd798064e9fd 100644 (file)
@@ -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