mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-15 15:11:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR other/45915 (Check for gnu_unique_object in ld.so in gcc/configure.ac is broken for non-glibc ldd)

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

From-SVN: r168546
This commit is contained in:
Rainer Orth 2011-01-06 18:29:39 +00:00 committed by Rainer Orth
parent 284d58f1dd
commit a4da64857d
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -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

1
gcc/configure vendored
View File

@ -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]*\)"`

3
gcc/configure.ac
View File

@ -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]*\)"`