1.1 --- a/scripts/build/libc_glibc.sh	Tue May 20 21:32:39 2008 +0000
     1.2 +++ b/scripts/build/libc_glibc.sh	Fri Jul 25 09:52:52 2008 +0000
     1.3 @@ -17,13 +17,19 @@
     1.4      # Ah! Not all GNU folks seem stupid. All glibc releases are in the same
     1.5      # directory. Good. Alas, there is no snapshot there. I'll deal with them
     1.6      # later on... :-/
     1.7 -    CT_GetFile "${CT_LIBC_FILE}" {ftp,http}://ftp.gnu.org/gnu/glibc
     1.8 +    CT_GetFile "${CT_LIBC_FILE}"                        \
     1.9 +               {ftp,http}://ftp.gnu.org/gnu/glibc       \
    1.10 +               ftp://gcc.gnu.org/pub/glibc/releases     \
    1.11 +               ftp://gcc.gnu.org/pub/glibc/snapshots
    1.12  
    1.13      # C library addons
    1.14      for addon in $(do_libc_add_ons_list " "); do
    1.15          # NPTL addon is not to be downloaded, in any case
    1.16          [ "${addon}" = "nptl" ] && continue || true
    1.17 -        CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" {ftp,http}://ftp.gnu.org/gnu/glibc
    1.18 +        CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \
    1.19 +                   {ftp,http}://ftp.gnu.org/gnu/glibc       \
    1.20 +                   ftp://gcc.gnu.org/pub/glibc/releases     \
    1.21 +                   ftp://gcc.gnu.org/pub/glibc/snapshots
    1.22      done
    1.23  
    1.24      return 0
    1.25 @@ -219,6 +225,12 @@
    1.26      # Add some default CC args
    1.27      glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
    1.28      glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
    1.29 +    # In case we're using a snapshot, fake a >=2.6 version.
    1.30 +    if [    "${CT_LIBC_V_LATEST}" = "y" \
    1.31 +         -o "${CT_LIBC_V_date}" = "y"   ]; then
    1.32 +        glibc_version_major=3
    1.33 +        glibc_version_minor=0
    1.34 +    fi
    1.35      if [    ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6    \
    1.36           -o ${glibc_version_major} -gt 2                                    ]; then
    1.37          # Don't use -pipe: configure chokes on it for glibc >= 2.6.
    1.38 @@ -324,6 +336,12 @@
    1.39      # Add some default CC args
    1.40      glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
    1.41      glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
    1.42 +    # In case we're using a snapshot, fake a >=2.6 version.
    1.43 +    if [    "${CT_LIBC_V_LATEST}" = "y" \
    1.44 +         -o "${CT_LIBC_V_date}" = "y"   ]; then
    1.45 +        glibc_version_major=3
    1.46 +        glibc_version_minor=0
    1.47 +    fi
    1.48      if [    ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6    \
    1.49           -o ${glibc_version_major} -gt 2                                    ]; then
    1.50          # Don't use -pipe: configure chokes on it for glibc >= 2.6.