1.1 --- a/config/global/download_extract.in	Thu May 15 20:42:45 2008 +0000
     1.2 +++ b/config/global/download_extract.in	Thu May 15 20:45:18 2008 +0000
     1.3 @@ -209,6 +209,26 @@
     1.4        Usefull if you suspect a previous extract did not complete (eg. broken
     1.5        tarball), or you added a new set of patches for this component.
     1.6  
     1.7 +config OVERIDE_CONFIG_GUESS_SUB
     1.8 +    bool
     1.9 +    prompt "Override config.{guess,sub}"
    1.10 +    default y
    1.11 +    help
    1.12 +      Override tools' versions of config.guess and config.sub with the ones
    1.13 +      from crosstool-NG. This means that all instances of config.guess and
    1.14 +      config.sub in gcc, binutils, glibc, etc... will be replaced.
    1.15 +
    1.16 +      Most of the time, the versions of those scripts found in packages are old
    1.17 +      versions, thus lacking some target definitions. This is the case for
    1.18 +      uClibc-based tuples in old versions of gcc and gdb, for example.
    1.19 +
    1.20 +      Also, doing so will guarantee that all components have the same tuples
    1.21 +      definitions for your target, and not diverging ones.
    1.22 +
    1.23 +      You can update the ones provided with crosstool-NG by first running:
    1.24 +        ct-ng updatetools
    1.25 +      in the directory where you want to run crosstool-NG prior to the build.
    1.26 +
    1.27  config ONLY_EXTRACT
    1.28      bool
    1.29      prompt "Stop after extracting tarballs"

     2.1 --- a/scripts/functions	Thu May 15 20:42:45 2008 +0000
     2.2 +++ b/scripts/functions	Thu May 15 20:45:18 2008 +0000
     2.3 @@ -441,8 +441,8 @@
     2.4      CT_DoLog EXTRA "Patching \"${file}\""
     2.5  
     2.6      if [ "${libc_addon}" = "y" ]; then
     2.7 -        # Some addons tarball directly contian the correct addon directory,
     2.8 -        # while others have the addon directory named ofter the tarball.
     2.9 +        # Some addon tarballs directly contain the correct addon directory,
    2.10 +        # while others have the addon directory named after the tarball.
    2.11          # Fix that by always using the short name (eg: linuxthreads, ports, etc...)
    2.12          addon_short_name=`echo "${file}" |sed -r -e 's/^[^-]+-//; s/-[^-]+$//;'`
    2.13          [ -d "${addon_short_name}" ] || ln -s "${file}" "${addon_short_name}"
    2.14 @@ -467,6 +467,15 @@
    2.15          fi
    2.16      done
    2.17  
    2.18 +    if [ "${CT_OVERIDE_CONFIG_GUESS_SUB}" = "y" ]; then
    2.19 +        CT_DoLog ALL "Overiding config.guess and config.sub"
    2.20 +        for cfg in config_guess config_sub; do
    2.21 +            eval ${cfg}="${CT_LIB_DIR}/tools/${cfg/_/.}"
    2.22 +            [ -e "${CT_TOP_DIR}/tools/${cfg/_/.}" ] && eval ${cfg}="${CT_TOP_DIR}/tools/${cfg/_/.}"
    2.23 +            find . -type f -name "${cfg/_/.}" -exec cp -v "${!cfg}" {} \; |CT_DoLog ALL
    2.24 +        done
    2.25 +    fi
    2.26 +
    2.27      CT_Popd
    2.28  }
    2.29