diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-10 05:16:08 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-10 05:16:08 +0000 |
| commit | 5219ed3570dafacfa9b512fd9a2167515628c14a (patch) | |
| tree | 7ac3e36b3592f2b449951da1596755f33c771c3e /gcc/configure | |
| parent | 3d0687f7444f87d8a25d758809b3ae0bc08e0498 (diff) | |
| download | gcc-5219ed3570dafacfa9b512fd9a2167515628c14a.tar.gz | |
* configure.ac: Check glibc version even if we have an in-tree
assembler.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151585 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/configure b/gcc/configure index 2db7cf209f6..3cfc903a3a3 100755 --- a/gcc/configure +++ b/gcc/configure @@ -23985,16 +23985,7 @@ fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } 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]*\)"` - glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` - if test "$glibcnum" -ge 2011 ; then - gcc_cv_as_gnu_unique_object=yes - fi - fi + gcc_cv_as_gnu_unique_object=yes else echo "configure: failed program was" >&5 cat conftest.s >&5 @@ -24005,7 +23996,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_gnu_unique_object" >&5 $as_echo "$gcc_cv_as_gnu_unique_object" >&6; } if test $gcc_cv_as_gnu_unique_object = yes; then - enable_gnu_unique_object=yes + # 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]*\)"` + glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` + if test "$glibcnum" -ge 2011 ; then + enable_gnu_unique_object=yes + fi + fi fi fi |