Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 01 Mar 2016 10:07:12
Message-Id: 1456826813.5bf8dfe651b5f276e53c916ca0b9923be3549d4b.aballier@gentoo
1 commit: 5bf8dfe651b5f276e53c916ca0b9923be3549d4b
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 1 10:05:41 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 1 10:06:53 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf8dfe6
7
8 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.
9
10 eclass/portability.eclass | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/eclass/portability.eclass b/eclass/portability.eclass
14 index 02c7c73..4f29725 100644
15 --- a/eclass/portability.eclass
16 +++ b/eclass/portability.eclass
17 @@ -107,9 +107,9 @@ dlopen_lib() {
18 # Note: the bsdmake for Darwin userland is with compatibility with MacOSX
19 # default name.
20 get_bmake() {
21 - if [[ ${USERLAND} == *BSD ]]; then
22 + if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
23 echo make
24 - elif [[ ${USERLAND} == "Darwin" ]]; then
25 + elif [[ ${CBUILD:-${CHOST}} == *darwin* ]]; then
26 echo bsdmake
27 else
28 echo bmake