scripts: interpret *_EXTRA_CONFIG config variables arrays

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2011-05-15 18:51:40 +02:00
parent e109ca92a0
commit b00e501d7c
4 changed files with 9 additions and 9 deletions

View File

@ -70,8 +70,8 @@ do_binutils() {
--disable-werror \
"${extra_config[@]}" \
${CT_ARCH_WITH_FLOAT} \
${CT_BINUTILS_EXTRA_CONFIG} \
${BINUTILS_SYSROOT_ARG}
${BINUTILS_SYSROOT_ARG} \
"${CT_BINUTILS_EXTRA_CONFIG[@]}"
if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
extra_make_flags+=("LDFLAGS=-all-static")
@ -154,7 +154,7 @@ do_binutils_target() {
--disable-multilib \
"${extra_config[@]}" \
${CT_ARCH_WITH_FLOAT} \
${CT_BINUTILS_EXTRA_CONFIG}
"${CT_BINUTILS_EXTRA_CONFIG[@]}"
CT_DoLog EXTRA "Building binutils' libraries (${targets[*]}) for target"
CT_DoExecLog ALL make ${JOBSFLAGS} "${build_targets[@]}"

View File

@ -49,7 +49,7 @@ do_elf2flt() {
--with-libbfd=${binutils_bld}/bfd/libbfd.a \
--with-libiberty=${binutils_bld}/libiberty/libiberty.a \
${elf2flt_opts} \
${CT_ELF2FLT_EXTRA_CONFIG}
"${CT_ELF2FLT_EXTRA_CONFIG[@]}"
CT_DoLog EXTRA "Building elf2flt"
CT_DoExecLog ALL make ${JOBSFLAGS}

View File

@ -276,7 +276,7 @@ do_cc_core() {
--disable-nls \
--enable-symvers=gnu \
--enable-languages="${lang_opt}" \
${CT_CC_CORE_EXTRA_CONFIG}
"${CT_CC_CORE_EXTRA_CONFIG[@]}"
if [ "${build_libgcc}" = "yes" ]; then
# HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or
@ -555,7 +555,7 @@ do_cc() {
--enable-symvers=gnu \
--enable-c99 \
--enable-long-long \
${CT_CC_EXTRA_CONFIG}
"${CT_CC_EXTRA_CONFIG[@]}"
if [ "${CT_CANADIAN}" = "y" ]; then
CT_DoLog EXTRA "Building libiberty"

View File

@ -159,7 +159,7 @@ do_libc() {
nptl) extra_config+=("--with-__thread" "--with-tls");;
linuxthreads) extra_config+=("--with-__thread" "--without-tls" "--without-nptl");;
none) extra_config+=("--without-__thread" "--without-nptl")
case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
*-tls*) ;;
*) extra_config+=("--without-tls");;
esac
@ -250,7 +250,7 @@ do_libc() {
--without-gd \
--with-headers="${CT_HEADERS_DIR}" \
"${extra_config[@]}" \
${CT_LIBC_GLIBC_EXTRA_CONFIG}
"${CT_LIBC_GLIBC_EXTRA_CONFIG[@]}"
# build hacks
case "${CT_ARCH},${CT_ARCH_CPU}" in
@ -300,7 +300,7 @@ do_libc_add_ons_list() {
do_libc_min_kernel_config() {
local min_kernel_config
case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
*--enable-kernel*) ;;
*) if [ "${CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
# We can't rely on the kernel version from the configuration,