1.1 --- a/scripts/build/libc/glibc.sh Tue Jan 12 19:37:18 2010 +0100
1.2 +++ b/scripts/build/libc/glibc.sh Sun Jan 31 12:27:55 2010 +0100
1.3 @@ -377,8 +377,11 @@
1.4 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/^([[:digit:]]+).*/\1/')
1.8 - glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
1.9 + glibc_version="$( grep -E '\<VERSION\>' "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/version.h" \
1.10 + |cut -d '"' -f 2
1.11 + )"
1.12 + glibc_version_major=$(echo ${glibc_version} |sed -r -e 's/^([[:digit:]]+).*/\1/')
1.13 + glibc_version_minor=$(echo ${glibc_version} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
1.14 if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \
1.15 -o ${glibc_version_major} -gt 2 ]; then
1.16 # Don't use -pipe: configure chokes on it for glibc >= 2.6.