summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/mozcoreconf-v4.eclass')
-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