1.1 --- a/scripts/crosstool-NG.sh.in	Tue Nov 13 15:06:18 2012 +0000
     1.2 +++ b/scripts/crosstool-NG.sh.in	Fri Nov 16 14:59:27 2012 +0100
     1.3 @@ -126,12 +126,7 @@
     1.4  . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh"
     1.5  . "${CT_LIB_DIR}/scripts/build/companion_tools.sh"
     1.6  . "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh"
     1.7 -. "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh"
     1.8 -. "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh"
     1.9 -. "${CT_LIB_DIR}/scripts/build/companion_libs/ppl.sh"
    1.10 -. "${CT_LIB_DIR}/scripts/build/companion_libs/cloog.sh"
    1.11 -. "${CT_LIB_DIR}/scripts/build/companion_libs/mpc.sh"
    1.12 -. "${CT_LIB_DIR}/scripts/build/companion_libs/libelf.sh"
    1.13 +. "${CT_LIB_DIR}/scripts/build/companion_libs.sh"
    1.14  . "${CT_LIB_DIR}/scripts/build/binutils/binutils.sh"
    1.15  . "${CT_LIB_DIR}/scripts/build/binutils/elf2flt.sh"
    1.16  . "${CT_LIB_DIR}/scripts/build/binutils/sstrip.sh"
    1.17 @@ -539,12 +534,7 @@
    1.18      CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
    1.19      do_companion_tools_get
    1.20      do_kernel_get
    1.21 -    do_gmp_get
    1.22 -    do_mpfr_get
    1.23 -    do_ppl_get
    1.24 -    do_cloog_get
    1.25 -    do_mpc_get
    1.26 -    do_libelf_get
    1.27 +    do_companion_libs_get
    1.28      do_binutils_get
    1.29      do_elf2flt_get
    1.30      do_sstrip_get
    1.31 @@ -569,12 +559,7 @@
    1.32  
    1.33          CT_DoStep INFO "Extracting and patching toolchain components"
    1.34          do_kernel_extract
    1.35 -        do_gmp_extract
    1.36 -        do_mpfr_extract
    1.37 -        do_ppl_extract
    1.38 -        do_cloog_extract
    1.39 -        do_mpc_extract
    1.40 -        do_libelf_extract
    1.41 +        do_companion_libs_extract
    1.42          do_binutils_extract
    1.43          do_elf2flt_extract
    1.44          do_sstrip_extract