summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2016-07-06 16:54:58 -0400
committerIan Stakenvicius <axs@gentoo.org>2016-07-06 17:25:01 -0400
commite6dfd5d1a8ed9cd7be9d9bafbac5f8cb096637fc (patch)
tree68e226b3f210effe8f4af297832a45f1eefa7061
parentwww-client/firefox: minor version bump, fix musl (diff)
downloadgentoo-e6dfd5d1a8ed9cd7be9d9bafbac5f8cb096637fc.tar.gz
gentoo-e6dfd5d1a8ed9cd7be9d9bafbac5f8cb096637fc.tar.bz2
gentoo-e6dfd5d1a8ed9cd7be9d9bafbac5f8cb096637fc.zip
mozcoreconf-v4.eclass: honour toolchain even for build tools
HOST_CC and HOST_CXX are used to build tools like nsinstall which are needed to install later on. Until now, these values were undefined and for whatever reason were never autodetected to match the CHOST based tools. This commit should resolve that issue. Bug: http://bugs.gentoo.org/565124
-rw-r--r--eclass/mozcoreconf-v4.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass
index 191f5fa76468..3a43905ff321 100644
--- a/eclass/mozcoreconf-v4.eclass
+++ b/eclass/mozcoreconf-v4.eclass
@@ -15,7 +15,7 @@
# This is an eclass-generated variable that defines the rpath that the mozilla
# product will be installed in. Read-only
-if [[ ! ${_MOZCORECONF_V3} ]]; then
+if [[ ! ${_MOZCORECONF} ]]; then
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
@@ -86,6 +86,8 @@ moz_pkgsetup() {
export LC_CTYPE="C"
# Ensure we use correct toolchain
+ export HOST_CC="$(tc-getBUILD_CC)"
+ export HOST_CXX="$(tc-getBUILD_CXX)"
tc-export CC CXX LD PKG_CONFIG
# Ensure that we have a sane build enviroment
@@ -263,5 +265,5 @@ mozconfig_final() {
echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
}
-_MOZCORECONF_V3=1
+_MOZCORECONF=1
fi