From 5bf8dfe651b5f276e53c916ca0b9923be3549d4b Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 1 Mar 2016 11:05:41 +0100
Subject: [PATCH] eclass/portability.eclass: Discriminate on CBUILD:-CHOST for
 getting the bmake binary name instead of USERLAND variable. This helps for
 cross-compiling from another userland.

---
 eclass/portability.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 02c7c738f41e..4f29725e2e32 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -107,9 +107,9 @@ dlopen_lib() {
 # Note: the bsdmake for Darwin userland is with compatibility with MacOSX
 # default name.
 get_bmake() {
-	if [[ ${USERLAND} == *BSD ]]; then
+	if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
 		echo make
-	elif [[ ${USERLAND} == "Darwin" ]]; then
+	elif [[ ${CBUILD:-${CHOST}} == *darwin* ]]; then
 		echo bsdmake
 	else
 		echo bmake
-- 
2.26.2