Remove code for gcc-config/binutils-config since it should be getting done in the...

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

diff --git a/ChangeLog b/ChangeLog
index 1c122fbeed20f173c44962c0541151b88d28408b..42ce8b2ffcd0f6e145f6fe679025c3bfafd9a05b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  29 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-controller.sh:
+  Remove code for gcc-config/binutils-config since it should be getting done
+  in the preclean script, anyway.
+
   29 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:
   I missed one place where HOSTUSE was being used incorrectly.

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 4e100e62c4678fac84536208271c96f20dc45ce6..0ecad29f19f54a89bcdfc807c776f583490b22e0 100755 (executable)
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -22,30 +22,6 @@ case $1 in
                        || exit 1
        ;;
        preclean)
-               # Before we enter the chroot, we need to run gcc-config/binutils-config
-               if [ -x /usr/bin/gcc-config ] && [ -z "${clst_FETCH}" ]
-               then
-                       mythang=$( cd ${clst_chroot_path}/tmp/stage1root/etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
-                       if [ -z "${mythang}" ]
-                       then
-                               mythang=1
-                       fi
-                       ROOT=${clst_chroot_path}/tmp/stage1root/ \
-                       CHOST=${clst_CHOST} \
-                               gcc-config ${mythang}
-               fi
-               if [ -x /usr/bin/binutils-config ] && [ -z "${clst_FETCH}" ]
-               then
-                       mythang=$( cd ${clst_chroot_path}/tmp/stage1root/etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
-                       if [ -z "${mythang}" ]
-                       then
-                               mythang=1
-                       fi
-                       ROOT=${clst_chroot_path}/tmp/stage1root/ \
-                       CHOST=${clst_CHOST} \
-                               binutils-config ${mythang}
-               fi
-
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1
        ;;
        clean)