configure.ac (gnu-unique-object): Fix ldd version check.

2010-01-27  Matthias Klose  <doko@ubuntu.com>

        * configure.ac (gnu-unique-object): Fix ldd version check.
        * configure: Regenerate.

From-SVN: r156281

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16840a862d03456d5e541f1a94d5e41dd78d9b22..75c6cbffa8aeed08d2cde484d5a4e6866751a944 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Matthias Klose  <doko@ubuntu.com>
+
+       * configure.ac (gnu-unique-object): Fix ldd version check.
+       * configure: Regenerate.
+
 2010-01-27  Wei Guozhi  <carrot@google.com>
 
         PR target/42671

diff --git a/gcc/configure b/gcc/configure
index d6c8dc481fd654852551f7494eeeeff78bb7d3c3..589c8b4299cdeefe541c9a552563ed18b32970a3 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -24220,9 +24220,9 @@ $as_echo "$gcc_cv_as_gnu_unique_object" >&6; }
 if test $gcc_cv_as_gnu_unique_object = yes; then
   # Also check for ld.so support, i.e. glibc 2.11 or higher.
    if test x$host = x$build -a x$host = x$target &&
-       glibcver=`ldd --version 2>/dev/null`; then
-      glibcmajor=`expr "$glibcver" : "ldd (GNU libc) \([0-9]*\)"`
-      glibcminor=`expr "$glibcver" : "ldd (GNU libc) [0-9]*\.\([0-9]*\)"`
+       glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
+      glibcmajor=`expr "$glibcver" : "\(0-9*\)"`
+      glibcminor=`expr "$glibcver" : "2-9*\.\(0-9*\)"`
       glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
       if test "$glibcnum" -ge 2011 ; then
         enable_gnu_unique_object=yes

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 6247d32ec0264d72e8621b13fb05d41ec38ec3d9..0d507e99b55a1aa712a50b9c49195b73be7beea2 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3567,9 +3567,9 @@ Valid choices are 'yes' and 'no'.]) ;;
    [.type foo, @gnu_unique_object],,
 # Also check for ld.so support, i.e. glibc 2.11 or higher.
    [if test x$host = x$build -a x$host = x$target &&
-       glibcver=`ldd --version 2>/dev/null`; then
-      glibcmajor=`expr "$glibcver" : "ldd (GNU libc) \([[0-9]]*\)"`
-      glibcminor=`expr "$glibcver" : "ldd (GNU libc) [[0-9]]*\.\([[0-9]]*\)"`
+       glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
+      glibcmajor=`expr "$glibcver" : "\([0-9]*\)"`
+      glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"`
       glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
       if test "$glibcnum" -ge 2011 ; then
         enable_gnu_unique_object=yes