eclass/autotools.eclass: Use proper arguments to has_version checking for automake...

Bug: https://bugs.gentoo.org/655326

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index ea85e73a8042586ca0a92d2249c87957d498236e..2bc70f7b3c001605810bd6f4c707ea07f73372fa 100644 (file)
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -442,10 +442,17 @@ autotools_env_setup() {
        if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
                local pv
                for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
-                       # has_version respects ROOT, but in this case, we don't want it to,
-                       # thus "ROOT=/" prefix;
                        # Break on first hit to respect _LATEST_AUTOMAKE order.
-                       ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
+                       local hv_args=""
+                       case ${EAPI:-0} in
+                               5|6)
+                                       hv_args="--host-root"
+                                       ;;
+                               7)
+                                       hv_args="-b"
+                                       ;;
+                       esac
+                       ROOT=/ has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
                done
                [[ ${WANT_AUTOMAKE} == "latest" ]] && \
                        die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}"