1.1 --- a/scripts/crosstool.sh	Tue Aug 07 19:40:38 2007 +0000
     1.2 +++ b/scripts/crosstool.sh	Wed Aug 15 14:35:11 2007 +0000
     1.3 @@ -82,12 +82,6 @@
     1.4  # Now, build up the variables from the user-configured options.
     1.5  CT_KERNEL_FILE="${CT_KERNEL}-${CT_KERNEL_VERSION}"
     1.6  CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
     1.7 -if [ "${CT_CC_USE_CORE}" != "y" ]; then
     1.8 -    CT_CC_CORE="${CT_CC}"
     1.9 -    CT_CC_CORE_VERSION="${CT_CC_VERSION}"
    1.10 -    CT_CC_CORE_EXTRA_CONFIG="${CT_CC_EXTRA_CONFIG}"
    1.11 -fi
    1.12 -CT_CC_CORE_FILE="${CT_CC_CORE}-${CT_CC_CORE_VERSION}"
    1.13  CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
    1.14  CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"
    1.15  
    1.16 @@ -97,8 +91,7 @@
    1.17  CT_BUILD_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/build"
    1.18  CT_DEBUG_INSTALL_DIR="${CT_INSTALL_DIR}/${CT_TARGET}/debug-root"
    1.19  # Note: we'll always install the core compiler in its own directory, so as to
    1.20 -# not mix the two builds: core and final. Anyway, its generic, wether we use
    1.21 -# a different compiler as core, or not.
    1.22 +# not mix the two builds: core and final.
    1.23  CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static"
    1.24  CT_CC_CORE_SHARED_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-shared"
    1.25  CT_STATE_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/state"
    1.26 @@ -345,7 +338,6 @@
    1.27  . "${CT_LIB_DIR}/scripts/build/kernel_${CT_KERNEL}.sh"
    1.28  . "${CT_LIB_DIR}/scripts/build/binutils.sh"
    1.29  . "${CT_LIB_DIR}/scripts/build/libc_${CT_LIBC}.sh"
    1.30 -. "${CT_LIB_DIR}/scripts/build/cc_core_${CT_CC_CORE}.sh"
    1.31  . "${CT_LIB_DIR}/scripts/build/cc_${CT_CC}.sh"
    1.32  . "${CT_LIB_DIR}/scripts/build/debug.sh"
    1.33  . "${CT_LIB_DIR}/scripts/build/tools.sh"
    1.34 @@ -354,9 +346,8 @@
    1.35      CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
    1.36      do_kernel_get
    1.37      do_binutils_get
    1.38 -    do_cc_core_get
    1.39 +    do_cc_get
    1.40      do_libc_get
    1.41 -    do_cc_get
    1.42      do_tools_get
    1.43      do_debug_get
    1.44      CT_EndStep
    1.45 @@ -369,9 +360,8 @@
    1.46          CT_DoStep INFO "Extracting and patching toolchain components"
    1.47          do_kernel_extract
    1.48          do_binutils_extract
    1.49 -        do_cc_core_extract
    1.50 +        do_cc_extract
    1.51          do_libc_extract
    1.52 -        do_cc_extract
    1.53          do_tools_extract
    1.54          do_debug_extract
    1.55          CT_EndStep