| 1 |
commit: e6dfd5d1a8ed9cd7be9d9bafbac5f8cb096637fc |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 20:54:58 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 21:25:01 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6dfd5d1 |
| 7 |
|
| 8 |
mozcoreconf-v4.eclass: honour toolchain even for build tools |
| 9 |
|
| 10 |
HOST_CC and HOST_CXX are used to build tools like nsinstall which are needed |
| 11 |
to install later on. Until now, these values were undefined and for whatever |
| 12 |
reason were never autodetected to match the CHOST based tools. This commit |
| 13 |
should resolve that issue. |
| 14 |
|
| 15 |
Bug: http://bugs.gentoo.org/565124 |
| 16 |
|
| 17 |
eclass/mozcoreconf-v4.eclass | 6 ++++-- |
| 18 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass |
| 21 |
index 191f5fa..3a43905 100644 |
| 22 |
--- a/eclass/mozcoreconf-v4.eclass |
| 23 |
+++ b/eclass/mozcoreconf-v4.eclass |
| 24 |
@@ -15,7 +15,7 @@ |
| 25 |
# This is an eclass-generated variable that defines the rpath that the mozilla |
| 26 |
# product will be installed in. Read-only |
| 27 |
|
| 28 |
-if [[ ! ${_MOZCORECONF_V3} ]]; then |
| 29 |
+if [[ ! ${_MOZCORECONF} ]]; then |
| 30 |
|
| 31 |
PYTHON_COMPAT=( python2_7 ) |
| 32 |
PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' |
| 33 |
@@ -86,6 +86,8 @@ moz_pkgsetup() { |
| 34 |
export LC_CTYPE="C" |
| 35 |
|
| 36 |
# Ensure we use correct toolchain |
| 37 |
+ export HOST_CC="$(tc-getBUILD_CC)" |
| 38 |
+ export HOST_CXX="$(tc-getBUILD_CXX)" |
| 39 |
tc-export CC CXX LD PKG_CONFIG |
| 40 |
|
| 41 |
# Ensure that we have a sane build enviroment |
| 42 |
@@ -263,5 +265,5 @@ mozconfig_final() { |
| 43 |
echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig |
| 44 |
} |
| 45 |
|
| 46 |
-_MOZCORECONF_V3=1 |
| 47 |
+_MOZCORECONF=1 |
| 48 |
fi |
Archives