1.1 --- a/scripts/build/libc/uClibc.sh	Sun Feb 08 12:15:52 2009 +0000
     1.2 +++ b/scripts/build/libc/uClibc.sh	Wed Feb 11 10:40:26 2009 +0000
     1.3 @@ -142,38 +142,23 @@
     1.4           ${CT_LIBC_UCLIBC_VERBOSITY}    \
     1.5           install
     1.6  
     1.7 +    if [ "${CT_LIBC_UCLIBC_BUILD_CROSS_LDD}" = "y" ]; then
     1.8 +        CT_DoLog EXTRA "Building C library cross-ldd"
     1.9 +        CT_DoExecLog ALL                    \
    1.10 +        make PREFIX="${CT_SYSROOT_DIR}/"    \
    1.11 +             ${CT_LIBC_UCLIBC_VERBOSITY}    \
    1.12 +             -C utils hostutils
    1.13 +
    1.14 +        CT_DoLog EXTRA "Installing C library cross-ldd"
    1.15 +        CT_DoExecLog ALL install -m 0755 utils/ldd.host "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ldd"
    1.16 +    fi
    1.17 +
    1.18      CT_EndStep
    1.19  }
    1.20  
    1.21  # This function is used to install those components needing the final C compiler
    1.22  do_libc_finish() {
    1.23 -    # Build and install host-side ldd
    1.24 -    CT_DoStep INFO "Finishing C library"
    1.25 -
    1.26 -    mkdir -p "${CT_BUILD_DIR}/build-libc-finish"
    1.27 -    cd "${CT_BUILD_DIR}/build-libc-finish"
    1.28 -
    1.29 -    # Simply copy files until uClibc has the ablity to build out-of-tree
    1.30 -    CT_DoLog EXTRA "Copying sources to build dir"
    1.31 -    { cd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"; tar cf - .; } |tar xf -
    1.32 -
    1.33 -    # Retrieve the config file
    1.34 -    cp "${CT_STATE_DIR}/uClibc.config" .config
    1.35 -
    1.36 -    CT_DoLog EXTRA "Applying configuration"
    1.37 -    CT_DoYes "" |CT_DoExecLog ALL               \
    1.38 -                 make CROSS=${CT_TARGET}-       \
    1.39 -                 PREFIX="${CT_SYSROOT_DIR}/"    \
    1.40 -                 oldconfig
    1.41 -
    1.42 -    CT_DoLog EXTRA "Installing C library host utils"
    1.43 -    CT_DoExecLog ALL                    \
    1.44 -    make PREFIX="${CT_SYSROOT_DIR}/"    \
    1.45 -         ${CT_LIBC_UCLIBC_VERBOSITY}    \
    1.46 -         -C utils hostutils
    1.47 -    CT_DoExecLog ALL install -m 0755 utils/ldd.host "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ldd"
    1.48 -
    1.49 -    CT_EndStep
    1.50 +    :
    1.51  }
    1.52  
    1.53  # Initialises the .config file to sensible values