commit: 7d8dc5bcc9d2b25bd68a27c50239390e9a81265b Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> AuthorDate: Sat Jul 9 03:14:25 2016 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Sat Jul 9 03:14:25 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7d8dc5bc
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. Other minor cleanups to eclass also occurred Bug: http://bugs.gentoo.org/565124 eclass/mozcoreconf-v4.eclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass index e6771cc..3a43905 100644 --- a/eclass/mozcoreconf-v4.eclass +++ b/eclass/mozcoreconf-v4.eclass @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ # -# @ECLASS: mozcoreconf.eclass +# @ECLASS: mozcoreconf-v4.eclass # @MAINTAINER: # Mozilla team <mozi...@gentoo.org> # @BLURB: core options and configuration functions for mozilla # @DESCRIPTION: # -# inherit mozconfig-v5.* or above for mozilla configuration support +# inherit mozconfig-v6.* or above for mozilla configuration support # @ECLASS-VARIABLE: MOZILLA_FIVE_HOME -# @DESCCRIPTION: +# @DESCRIPTION: # 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
