diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-06-02 15:01:53 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-06-02 15:01:53 +0000 |
| commit | 7d68521ef7381ef5aec53785a0e62d7b02421917 (patch) | |
| tree | e55421d946bf76a4976c96174544783a7e75437b /eclass | |
| parent | Marked ppc stable. (diff) | |
| download | historical-7d68521ef7381ef5aec53785a0e62d7b02421917.tar.gz historical-7d68521ef7381ef5aec53785a0e62d7b02421917.tar.bz2 historical-7d68521ef7381ef5aec53785a0e62d7b02421917.zip | |
Added /tmp/stage1root to the gcc-config run in should_we_gcc_config to fix catalyst builds
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 29ad6b6df54e..2ab9addef5ee 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.160 2005/05/31 23:12:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.161 2005/06/02 15:01:53 wolf31o2 Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -1840,8 +1840,11 @@ do_gcc_PIE_patches() { } should_we_gcc_config() { - # we only want to switch compilers if installing to / - [[ ${ROOT} == "/" ]] || return 1 + # we only want to switch compilers if installing to / or /tmp/stage1root + if [ "${ROOT}" = "/" ] || [ "${ROOT}" = "/tmp/stage1root" ] + then + return 1 + fi # we always want to run gcc-config if we're bootstrapping, otherwise # we might get stuck with the c-only stage1 compiler |