mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-29 15:44:03 +00:00
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(-)
This commit is contained in:
parent
8b0663d59f
commit
daa31a0c34
@ -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
|
||||
}
|
||||
|
@ -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}"
|
||||
|
29
steps.mk
29
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user