Added patch from vapier for bug #117254.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1009 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 06f2c8cca3d5544a5405d808fee78e2bc1a399ad..7fd1a21edcfd191463d73a927ab02dee0c4b3253 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.496 2006/01/03 14:55:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.497 2006/01/04 19:51:03 wolf31o2 Exp $
+
+  04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-controller.sh:
+  Added patch from vapier for bug #117254.
 
   03 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/alpha.py,
   arch/amd64.py, arch/mips.py, arch/ppc.py, arch/ppc64.py, arch/s390.py,

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3755e157c13fa3c1773729cea4f797dcd5ab973a..b7b7e9d841602a6d212681c2228dba3ee7d9af4a 100755 (executable)
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.11 2005/12/21 21:03:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.12 2006/01/04 19:51:03 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -33,7 +33,9 @@ case $1 in
                        then
                                mythang=1
                        fi
-                       ROOT=${clst_chroot_path}/tmp/stage1root/ gcc-config ${mythang}
+                       ROOT=${clst_chroot_path}/tmp/stage1root/ \
+                       CHOST=${clst_CHOST} \
+                               gcc-config ${mythang}
                fi
                if [ -x /usr/bin/binutils-config ]
                then
@@ -42,7 +44,9 @@ case $1 in
                        then
                                mythang=1
                        fi
-                       ROOT=${clst_chroot_path}/tmp/stage1root/ binutils-config ${mythang}
+                       ROOT=${clst_chroot_path}/tmp/stage1root/ \
+                       CHOST=${clst_CHOST} \
+                               binutils-config ${mythang}
                fi
                ${clst_CHROOT} ${clst_chroot_path}/tmp/stage1root \
                        /usr/sbin/env-update || exit 1