| 1 |
commit: 3295c1c8647c047dd22475665f30be0ce0b58aa7 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 22:57:43 2015 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 30 03:14:30 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=3295c1c8 |
| 7 |
|
| 8 |
set --build=chost when not cross-compiling and set --host only when cross-compiling |
| 9 |
|
| 10 |
eclass/mozconfig-v6.42.eclass | 8 +++++++- |
| 11 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/mozconfig-v6.42.eclass b/eclass/mozconfig-v6.42.eclass |
| 14 |
index ce5d26c..5a26067 100644 |
| 15 |
--- a/eclass/mozconfig-v6.42.eclass |
| 16 |
+++ b/eclass/mozconfig-v6.42.eclass |
| 17 |
@@ -249,7 +249,13 @@ mozconfig_config() { |
| 18 |
# of --build, and --target intstead of --host. |
| 19 |
# Note, mozilla also has --build but it does not do what you think it does. |
| 20 |
mozconfig_annotate '' --target="${CHOST}" |
| 21 |
- mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" |
| 22 |
+ if [[ "${CBUILD:-${CHOST}}" == "${CHOST}" ]]; then |
| 23 |
+ # apply old --build setting when not cross-compiling |
| 24 |
+ mozconfig_annotate '' --build="${CHOST}" |
| 25 |
+ else |
| 26 |
+ # set --host when cross-compiling as otherwise it won't subconfigure |
| 27 |
+ mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" |
| 28 |
+ fi |
| 29 |
|
| 30 |
if use gstreamer ; then |
| 31 |
mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0 |
Archives