# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1209368316 0
# Node ID 63586e9dcfc35a7b4387d680ad95ac47cb69672e
# Parent  4574902ce43e0e40a9f2452cadf94ebf9b43bb90
Building target libraries before the cross-compiler is available is doomed! Move build binutils' target libraries after final gcc.
Have a unique list of steps, it's easier to maintain.

 /trunk/scripts/build/binutils.sh |    8     5     3     0 +++++---
 /trunk/scripts/crosstool.sh      |   16     2    14     0 ++--------------
 /trunk/steps.mk                  |   29    16    13     0 ++++++++++++++++-------------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff -r 4574902ce43e -r 63586e9dcfc3 scripts/build/binutils.sh
--- a/scripts/build/binutils.sh	Sun Apr 27 16:20:57 2008 +0000
+++ b/scripts/build/binutils.sh	Mon Apr 28 07:38:36 2008 +0000
@@ -57,7 +57,11 @@
         ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
     done |CT_DoLog ALL
 
-    # Now on for the target libraries
+    CT_EndStep
+}
+
+# Now on for the target libraries
+do_binutils_target() {
     targets=
     [ "${CT_BINUTILS_FOR_TARGET_IBERTY}" = "y" ] && targets="${build_targets} libiberty"
     [ "${CT_BINUTILS_FOR_TARGET_BFD}"    = "y" ] && targets="${build_targets} bfd"
@@ -88,6 +92,4 @@
         CT_Popd
         CT_EndStep
     fi
-
-    CT_EndStep
 }
diff -r 4574902ce43e -r 63586e9dcfc3 scripts/crosstool.sh
--- a/scripts/crosstool.sh	Sun Apr 27 16:20:57 2008 +0000
+++ b/scripts/crosstool.sh	Mon Apr 28 07:38:36 2008 +0000
@@ -455,20 +455,8 @@
     do_stop=0
     prev_step=
     [ -n "${CT_RESTART}" ] && do_it=0 || do_it=1
-    for step in libc_check_config       \
-                kernel_check_config     \
-                kernel_headers          \
-                binutils                \
-                cc_core_pass_1          \
-                libc_headers            \
-                libc_start_files        \
-                cc_core_pass_2          \
-                libc                    \
-                cc                      \
-                libc_finish             \
-                tools                   \
-                debug                   \
-                ; do
+    # CT_STEPS comes from steps.mk!
+    for step in ${CT_STEPS}; do
         if [ ${do_it} -eq 0 ]; then
             if [ "${CT_RESTART}" = "${step}" ]; then
                 CT_DoLoadState "${step}"
diff -r 4574902ce43e -r 63586e9dcfc3 steps.mk
--- a/steps.mk	Sun Apr 27 16:20:57 2008 +0000
+++ b/steps.mk	Mon Apr 28 07:38:36 2008 +0000
@@ -1,19 +1,22 @@
 # Makefile for each steps
 # Copyright 2006 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
 
-CT_STEPS := libc_check_config       \
-            kernel_check_config     \
-            kernel_headers          \
-            binutils                \
-            cc_core_pass_1          \
-            libc_headers            \
-            libc_start_files        \
-            cc_core_pass_2          \
-            libc                    \
-            cc                      \
-            libc_finish             \
-            tools                   \
-            debug                   \
+CT_STEPS := libc_check_config   \
+            kernel_check_config \
+            kernel_headers      \
+            binutils            \
+            cc_core_pass_1      \
+            libc_headers        \
+            libc_start_files    \
+            cc_core_pass_2      \
+            libc                \
+            cc                  \
+            libc_finish         \
+            binutils_target     \
+            tools               \
+            debug               \
+
+export CT_STEPS
 
 $(CT_STEPS):
 	@$(CT_NG) RESTART=$@ STOP=$@ build