1.1 --- a/scripts/build/libc/glibc.sh	Tue Jan 20 20:37:43 2009 +0000
     1.2 +++ b/scripts/build/libc/glibc.sh	Sun Jan 25 17:53:14 2009 +0000
     1.3 @@ -264,8 +264,8 @@
     1.4      extra_config="${extra_config} $(do_libc_min_kernel_config)"
     1.5  
     1.6      # Add some default CC args
     1.7 -    glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
     1.8 -    glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
     1.9 +    glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
    1.10 +    glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
    1.11      # In case we're using a snapshot, fake a >=2.6 version.
    1.12      if [    "${CT_LIBC_V_LATEST}" = "y" \
    1.13           -o "${CT_LIBC_V_date}" = "y"   ]; then
    1.14 @@ -376,8 +376,8 @@
    1.15      extra_config="${extra_config} $(do_libc_min_kernel_config)"
    1.16  
    1.17      # Add some default CC args
    1.18 -    glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
    1.19 -    glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
    1.20 +    glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
    1.21 +    glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
    1.22      # In case we're using a snapshot, fake a >=2.6 version.
    1.23      if [    "${CT_LIBC_V_LATEST}" = "y" \
    1.24           -o "${CT_LIBC_V_date}" = "y"   ]; then