summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-30 15:19:50 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-30 15:19:50 (GMT)
commite46e74546d3f9f89aa0ccf369f434049e62b1620 (patch)
tree190c8c924434f3f43fad3fbd499623b391a5f03f /scripts
parent58a53e7bf6b9d4a8cfc608b81b97bf7bdc9949e8 (diff)
libc/glibc: fix retrieving version string
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/libc/glibc.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 43beb3e..233cd3b 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -377,8 +377,11 @@ do_libc() {
extra_config+=("$(do_libc_min_kernel_config)")
# Add some default CC args
- glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
- glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
+ glibc_version="$( grep -E '\<VERSION\>' "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/version.h" \
+ |cut -d '"' -f 2
+ )"
+ glibc_version_major=$(echo ${glibc_version} |sed -r -e 's/^([[:digit:]]+).*/\1/')
+ glibc_version_minor=$(echo ${glibc_version} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \
-o ${glibc_version_major} -gt 2 ]; then
# Don't use -pipe: configure chokes on it for glibc >= 2.6.