mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-24 15:06:42 +00:00
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(-)
This commit is contained in:
parent
26e96f3ec5
commit
4a06d29717
@ -4,14 +4,14 @@
|
||||
|
||||
# Download binutils
|
||||
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://gcc.gnu.org/pub/binutils/{releases,snapshots}
|
||||
}
|
||||
|
||||
# Extract binutils
|
||||
do_binutils_extract() {
|
||||
CT_ExtractAndPatch "${CT_BINUTILS_FILE}"
|
||||
CT_ExtractAndPatch "binutils-${CT_BINUTILS_VERSION}"
|
||||
}
|
||||
|
||||
# Build binutils
|
||||
@ -29,19 +29,19 @@ do_binutils() {
|
||||
fi
|
||||
|
||||
CT_DoLog EXTRA "Configuring binutils"
|
||||
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_HOST} \
|
||||
--target=${CT_TARGET} \
|
||||
--prefix=${CT_PREFIX_DIR} \
|
||||
--disable-nls \
|
||||
--disable-multilib \
|
||||
--disable-werror \
|
||||
${binutils_opts} \
|
||||
${CT_ARCH_WITH_FLOAT} \
|
||||
${CT_BINUTILS_EXTRA_CONFIG} \
|
||||
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_HOST} \
|
||||
--target=${CT_TARGET} \
|
||||
--prefix=${CT_PREFIX_DIR} \
|
||||
--disable-nls \
|
||||
--disable-multilib \
|
||||
--disable-werror \
|
||||
${binutils_opts} \
|
||||
${CT_ARCH_WITH_FLOAT} \
|
||||
${CT_BINUTILS_EXTRA_CONFIG} \
|
||||
${BINUTILS_SYSROOT_ARG}
|
||||
|
||||
CT_DoLog EXTRA "Building binutils"
|
||||
@ -86,19 +86,19 @@ do_binutils_target() {
|
||||
CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target"
|
||||
|
||||
CT_DoLog EXTRA "Configuring binutils for target"
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
--target=${CT_TARGET} \
|
||||
--prefix=/usr \
|
||||
--disable-werror \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--disable-nls \
|
||||
--disable-multilib \
|
||||
${binutils_opts} \
|
||||
${CT_ARCH_WITH_FLOAT} \
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
--target=${CT_TARGET} \
|
||||
--prefix=/usr \
|
||||
--disable-werror \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--disable-nls \
|
||||
--disable-multilib \
|
||||
${binutils_opts} \
|
||||
${CT_ARCH_WITH_FLOAT} \
|
||||
${CT_BINUTILS_EXTRA_CONFIG}
|
||||
|
||||
build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;')
|
||||
|
@ -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}"
|
||||
|
||||
# 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_MPFR_FILE="mpfr-${CT_MPFR_VERSION}"
|
||||
CT_CC_FILE="${CT_CC}-${CT_CC_VERSION}"
|
||||
|
Loading…
Reference in New Issue
Block a user