summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-04-28 07:38:36 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-04-28 07:38:36 (GMT)
commitdaa31a0c3451ceba81737055ff374b241dc98fcc (patch)
treea8d8903188a19e089fa9c33ef6fb98bbd45ca2cf
parent8b0663d59f6a72359b20b17053fd46d050f71d33 (diff)
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(-)
-rw-r--r--scripts/build/binutils.sh8
-rwxr-xr-xscripts/crosstool.sh16
-rw-r--r--steps.mk29
3 files changed, 23 insertions, 30 deletions
diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh
index b34d709..ec39b2e 100644
--- a/scripts/build/binutils.sh
+++ b/scripts/build/binutils.sh
@@ -57,7 +57,11 @@ do_binutils() {
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 @@ do_binutils() {
CT_Popd
CT_EndStep
fi
-
- CT_EndStep
}
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index ec1c2b5..3027f1c 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -455,20 +455,8 @@ if [ "${CT_ONLY_DOWNLOAD}" != "y" -a "${CT_ONLY_EXTRACT}" != "y" ]; then
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 --git a/steps.mk b/steps.mk
index f685263..80f80a7 100644
--- a/steps.mk
+++ b/steps.mk
@@ -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