diff options
| author | Matthias Klose <doko@ubuntu.com> | 2010-01-27 13:02:50 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2010-01-27 13:02:50 +0000 |
| commit | 25d4be7f9cf393a51a5b4930f1094900fd7b7383 (patch) | |
| tree | 57c5bd00c8a2025fa930098fde8f59b0502398b4 | |
| parent | b0c8d8ba9e68c44e53cbdf7ae9f8b3199744d8a3 (diff) | |
2010-01-27 Matthias Klose <doko@ubuntu.com>
* configure.ac (gnu-unique-object): Fix ldd version check.
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@156281 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 16840a862d0..75c6cbffa8a 100644 --- 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 d6c8dc481fd..589c8b4299c 100755 --- 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 6247d32ec02..0d507e99b55 100644 --- 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 |