Get rid of CT_BINUTILS_FILE.
/trunk/scripts/build/binutils.sh | 56 28 28 0 +++++++++++++++++++++++-----------------------
/trunk/scripts/crosstool.sh | 1 0 1 0 -
2 files changed, 28 insertions(+), 29 deletions(-)
1.1 --- a/scripts/build/binutils.sh Sun Jan 04 14:18:20 2009 +0000
1.2 +++ b/scripts/build/binutils.sh Sun Jan 04 14:21:00 2009 +0000
1.3 @@ -4,14 +4,14 @@
1.4
1.5 # Download binutils
1.6 do_binutils_get() {
1.7 - CT_GetFile "${CT_BINUTILS_FILE}" \
1.8 + CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \
1.9 {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \
1.10 ftp://gcc.gnu.org/pub/binutils/{releases,snapshots}
1.11 }
1.12
1.13 # Extract binutils
1.14 do_binutils_extract() {
1.15 - CT_ExtractAndPatch "${CT_BINUTILS_FILE}"
1.16 + CT_ExtractAndPatch "binutils-${CT_BINUTILS_VERSION}"
1.17 }
1.18
1.19 # Build binutils
1.20 @@ -29,19 +29,19 @@
1.21 fi
1.22
1.23 CT_DoLog EXTRA "Configuring binutils"
1.24 - CFLAGS="${CT_CFLAGS_FOR_HOST}" \
1.25 - CT_DoExecLog ALL \
1.26 - "${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \
1.27 - --build=${CT_BUILD} \
1.28 - --host=${CT_HOST} \
1.29 - --target=${CT_TARGET} \
1.30 - --prefix=${CT_PREFIX_DIR} \
1.31 - --disable-nls \
1.32 - --disable-multilib \
1.33 - --disable-werror \
1.34 - ${binutils_opts} \
1.35 - ${CT_ARCH_WITH_FLOAT} \
1.36 - ${CT_BINUTILS_EXTRA_CONFIG} \
1.37 + CFLAGS="${CT_CFLAGS_FOR_HOST}" \
1.38 + CT_DoExecLog ALL \
1.39 + "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
1.40 + --build=${CT_BUILD} \
1.41 + --host=${CT_HOST} \
1.42 + --target=${CT_TARGET} \
1.43 + --prefix=${CT_PREFIX_DIR} \
1.44 + --disable-nls \
1.45 + --disable-multilib \
1.46 + --disable-werror \
1.47 + ${binutils_opts} \
1.48 + ${CT_ARCH_WITH_FLOAT} \
1.49 + ${CT_BINUTILS_EXTRA_CONFIG} \
1.50 ${BINUTILS_SYSROOT_ARG}
1.51
1.52 CT_DoLog EXTRA "Building binutils"
1.53 @@ -86,19 +86,19 @@
1.54 CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target"
1.55
1.56 CT_DoLog EXTRA "Configuring binutils for target"
1.57 - CT_DoExecLog ALL \
1.58 - "${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \
1.59 - --build=${CT_BUILD} \
1.60 - --host=${CT_TARGET} \
1.61 - --target=${CT_TARGET} \
1.62 - --prefix=/usr \
1.63 - --disable-werror \
1.64 - --enable-shared \
1.65 - --enable-static \
1.66 - --disable-nls \
1.67 - --disable-multilib \
1.68 - ${binutils_opts} \
1.69 - ${CT_ARCH_WITH_FLOAT} \
1.70 + CT_DoExecLog ALL \
1.71 + "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
1.72 + --build=${CT_BUILD} \
1.73 + --host=${CT_TARGET} \
1.74 + --target=${CT_TARGET} \
1.75 + --prefix=/usr \
1.76 + --disable-werror \
1.77 + --enable-shared \
1.78 + --enable-static \
1.79 + --disable-nls \
1.80 + --disable-multilib \
1.81 + ${binutils_opts} \
1.82 + ${CT_ARCH_WITH_FLOAT} \
1.83 ${CT_BINUTILS_EXTRA_CONFIG}
1.84
1.85 build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;')
2.1 --- a/scripts/crosstool.sh Sun Jan 04 14:18:20 2009 +0000
2.2 +++ b/scripts/crosstool.sh Sun Jan 04 14:21:00 2009 +0000
2.3 @@ -85,7 +85,6 @@
2.4 CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
2.5
2.6 # Now, build up the variables from the user-configured options.
2.7 -CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
2.8 CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
2.9 CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"
2.10 CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"