1.1 --- a/scripts/crosstool-NG.sh.in Tue Jan 12 21:21:39 2010 +0100
1.2 +++ b/scripts/crosstool-NG.sh.in Sat Jan 23 22:06:11 2010 +0100
1.3 @@ -114,6 +114,7 @@
1.4 # export any variable, nor re-parse the configuration and functions files.
1.5 . "${CT_LIB_DIR}/scripts/build/internals.sh"
1.6 . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh"
1.7 +. "${CT_LIB_DIR}/scripts/build/companion_tools.sh"
1.8 . "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh"
1.9 . "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh"
1.10 . "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh"
1.11 @@ -493,6 +494,7 @@
1.12 CT_DoLog INFO "Downloading forbidden by configuration, skipping downloads"
1.13 else
1.14 CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
1.15 + do_companion_tools_get
1.16 do_kernel_get
1.17 do_gmp_get
1.18 do_mpfr_get
1.19 @@ -512,6 +514,14 @@
1.20 CT_DoForceRmdir "${CT_SRC_DIR}"
1.21 CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
1.22 fi
1.23 +
1.24 + if [ "${CT_COMP_TOOLS}" = "y" ]; then
1.25 + CT_DoStep INFO "Extracting, patching and installing companion tools"
1.26 + do_companion_tools_extract
1.27 + do_companion_tools
1.28 + CT_EndStep
1.29 + fi
1.30 +
1.31 CT_DoStep INFO "Extracting and patching toolchain components"
1.32 do_kernel_extract
1.33 do_gmp_extract