diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-30 16:19:50 +0100 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-30 16:19:50 +0100 |
| commit | e46e74546d3f9f89aa0ccf369f434049e62b1620 (patch) | |
| tree | 190c8c924434f3f43fad3fbd499623b391a5f03f | |
| parent | 58a53e7bf6b9d4a8cfc608b81b97bf7bdc9949e8 (diff) | |
| download | crosstool-ng-e46e74546d3f9f89aa0ccf369f434049e62b1620.tar.gz crosstool-ng-e46e74546d3f9f89aa0ccf369f434049e62b1620.tar.bz2 crosstool-ng-e46e74546d3f9f89aa0ccf369f434049e62b1620.zip | |
libc/glibc: fix retrieving version string
| -rw-r--r-- | scripts/build/libc/glibc.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 43beb3ee..233cd3bf 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. |