summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-06-02 15:01:53 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-06-02 15:01:53 +0000
commit02d3139a24da0a491e09877891a8ff2605fe3f95 (patch)
tree07ff5c9050bcd0ec964494c2d5290e848915914b /eclass/toolchain.eclass
parentMarked ppc stable. (diff)
downloadgentoo-2-02d3139a24da0a491e09877891a8ff2605fe3f95.tar.gz
gentoo-2-02d3139a24da0a491e09877891a8ff2605fe3f95.tar.bz2
gentoo-2-02d3139a24da0a491e09877891a8ff2605fe3f95.zip
Added /tmp/stage1root to the gcc-config run in should_we_gcc_config to fix catalyst builds
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass9
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