re PR other/45915 (Check for gnu_unique_object in ld.so in gcc/configure.ac is broken...

	PR other/45915
	* configure.ac (gcc_cv_as_gnu_unique_object): Only use ldd
	--version output if supported.
	* configure: Regenerate.

From-SVN: r168546

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 35498f06576cdd2f83508e3a15d738e64c4d2ab0..539684e0f299726c8fd0bdb08173c3a38c18c834 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       PR other/45915
+       * configure.ac (gcc_cv_as_gnu_unique_object): Only use ldd
+       --version output if supported.
+       * configure: Regenerate.
+
 2011-01-06  Joseph Myers  <joseph@codesourcery.com>
 
        * config/linux-android.opt (tno-android-cc, tno-android-ld): New

diff --git a/gcc/configure b/gcc/configure
index 1c95830d58c24827b53e88689762b990fc361091..d1a68a843708d0178067f531cf04cee9c981fcab 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -25207,6 +25207,7 @@ $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 &&
+       ldd --version 2>/dev/null &&
        glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
       glibcmajor=`expr "$glibcver" : "\([0-9]*\)"`
       glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"`

diff --git a/gcc/configure.ac b/gcc/configure.ac
index ad8d008837bdc54980752defad5a9745550c3950..4e7ace487a708b37d2158d024623d5b23074b592 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to generate a configuration script.
 
 # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -3885,6 +3885,7 @@ 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 &&
+       ldd --version 2>/dev/null &&
        glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
       glibcmajor=`expr "$glibcver" : "\([0-9]*\)"`
       glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"`