diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-10-11 04:21:54 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-10-11 04:21:54 +0000 |
| commit | f17cba9709a11fa4c70f35803b911c0ffdd2255c (patch) | |
| tree | 63746aff0b63ef8e3947b64dd703608c342b388f /eclass | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-f17cba9709a11fa4c70f35803b911c0ffdd2255c.tar.gz gentoo-2-f17cba9709a11fa4c70f35803b911c0ffdd2255c.tar.bz2 gentoo-2-f17cba9709a11fa4c70f35803b911c0ffdd2255c.zip | |
always switch gcc profile if bootstrapping!
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 35f6ab272765..c6301dba50ff 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.27 2004/10/06 13:57:39 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.28 2004/10/11 04:21:54 lv Exp $ # # This eclass should contain general toolchain-related functions that are # expected to not change, or change much. @@ -553,8 +553,9 @@ do_gcc_config() { # emerge world -e with multiple slotted compilers installed will compile # some packages with one compiler and others with another. besides, it's # just plain rude. ;) + # ...unless we're bootstrapping and NEED a compiler with c++! local current_gcc_libpath="$(gcc-config -L)" - if [ -e ${ROOT}${current_gcc_libpath%:*}/specs -a -e ${ROOT}/etc/env.d/gcc/${current_gcc_config} ] ; then + if [ -e ${ROOT}${current_gcc_libpath%:*}/specs -a -e ${ROOT}/etc/env.d/gcc/${current_gcc_config} ] && use !bootstrap && use !build ; then local current_gcc_version="$(echo ${current_gcc_config} | awk -F - '{ print $5 }')" if [ "${current_gcc_version}" != "${MY_PV_FULL}" ] ; then # if we're installing a genuinely different compiler version, we |