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

[Alexis Ballier]

commit:     5bf8dfe651b5f276e53c916ca0b9923be3549d4b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 10:05:41 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf8dfe6

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 02c7c73..4f29725 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