summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-05-02 22:47:43 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-05-02 22:47:43 (GMT)
commit1dc26cbbcd89c126f9b8435acfff23fbb7e4c24f (patch)
treef247ede812b6c99a0e30ad5e2dfa2d1e965cbc84 /scripts
parent3d8a1efd058e773ac448e411b247b7f987e52c3f (diff)
Fix testing glibc versions for -pipe.
/trunk/scripts/build/libc_glibc.sh | 6 4 2 0 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/libc_glibc.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh
index 1a5b7d9..0040a85 100644
--- a/scripts/build/libc_glibc.sh
+++ b/scripts/build/libc_glibc.sh
@@ -219,7 +219,8 @@ do_libc_start_files() {
# Add some default CC args
glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
- if [ ${glibc_version_major} -ge 2 -a ${glibc_version_minor} -ge 6 ]; then
+ 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.
CT_Test 'Removing "-pipe" for use with glibc>=2.6' "${CT_USE_PIPES}" = "y"
extra_cc_args="${CT_CFLAGS_FOR_HOST/-pipe}"
@@ -323,7 +324,8 @@ do_libc() {
# Add some default CC args
glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
- if [ ${glibc_version_major} -ge 2 -a ${glibc_version_minor} -ge 6 ]; then
+ 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.
CT_Test 'Removing "-pipe" for use with glibc>=2.6' "${CT_USE_PIPES}" = "y"
extra_cc_args="${CT_CFLAGS_FOR_HOST/-pipe}"