ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-25 07:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of CT_BINUTILS_FILE.

Browse Source 
/trunk/scripts/build/binutils.sh |   56    28    28     0 +++++++++++++++++++++++-----------------------
 /trunk/scripts/crosstool.sh      |    1     0     1     0 -
 2 files changed, 28 insertions(+), 29 deletions(-)
This commit is contained in:
Yann E. MORIN" 2009-01-04 14:21:00 +00:00
parent 26e96f3ec5
commit 4a06d29717
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scripts/build/binutils.sh
View File

@ -4,14 +4,14 @@
# Download binutils # Download binutils
do_binutils_get() { do_binutils_get() {
CT_GetFile "${CT_BINUTILS_FILE}" \ CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \
{ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \
ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} ftp://gcc.gnu.org/pub/binutils/{releases,snapshots}
} }
# Extract binutils # Extract binutils
do_binutils_extract() { do_binutils_extract() {
CT_ExtractAndPatch "${CT_BINUTILS_FILE}" CT_ExtractAndPatch "binutils-${CT_BINUTILS_VERSION}"
} }
# Build binutils # Build binutils
@ -29,19 +29,19 @@ do_binutils() {
fi fi
CT_DoLog EXTRA "Configuring binutils" CT_DoLog EXTRA "Configuring binutils"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \ CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \ CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \ "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_HOST} \ --host=${CT_HOST} \
--target=${CT_TARGET} \ --target=${CT_TARGET} \
--prefix=${CT_PREFIX_DIR} \ --prefix=${CT_PREFIX_DIR} \
--disable-nls \ --disable-nls \
--disable-multilib \ --disable-multilib \
--disable-werror \ --disable-werror \
${binutils_opts} \ ${binutils_opts} \
${CT_ARCH_WITH_FLOAT} \ ${CT_ARCH_WITH_FLOAT} \
${CT_BINUTILS_EXTRA_CONFIG} \ ${CT_BINUTILS_EXTRA_CONFIG} \
${BINUTILS_SYSROOT_ARG} ${BINUTILS_SYSROOT_ARG}
CT_DoLog EXTRA "Building binutils" CT_DoLog EXTRA "Building binutils"
@ -86,19 +86,19 @@ do_binutils_target() {
CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target" CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target"
CT_DoLog EXTRA "Configuring binutils for target" CT_DoLog EXTRA "Configuring binutils for target"
CT_DoExecLog ALL \ CT_DoExecLog ALL \
"${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \ "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_TARGET} \ --host=${CT_TARGET} \
--target=${CT_TARGET} \ --target=${CT_TARGET} \
--prefix=/usr \ --prefix=/usr \
--disable-werror \ --disable-werror \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-nls \ --disable-nls \
--disable-multilib \ --disable-multilib \
${binutils_opts} \ ${binutils_opts} \
${CT_ARCH_WITH_FLOAT} \ ${CT_ARCH_WITH_FLOAT} \
${CT_BINUTILS_EXTRA_CONFIG} ${CT_BINUTILS_EXTRA_CONFIG}
build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;') build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;')

1
scripts/crosstool.sh
View File

@ -85,7 +85,6 @@ CT_CC_CORE_EXTRA_CONFIG="${CT_ARCH_CC_CORE_EXTRA_CONFIG} ${CT_CC_CORE_EXTRA_CONF
CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}" CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
# Now, build up the variables from the user-configured options. # Now, build up the variables from the user-configured options.
CT_BINUTILS_FILE="binutils-${CT_BINUTILS_VERSION}"
CT_GMP_FILE="gmp-${CT_GMP_VERSION}" CT_GMP_FILE="gmp-${CT_GMP_VERSION}"
CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}" CT_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"
CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}" CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"