This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-769-g6706074
- From: adconrad at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Nov 2012 07:07:18 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-769-g6706074
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 6706074627da7734d21f0024b6f7fb58b5629d6b (commit)
from 800938a1268309932c20dc523bb226bcab4bfe18 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6706074627da7734d21f0024b6f7fb58b5629d6b
commit 6706074627da7734d21f0024b6f7fb58b5629d6b
Author: Adam Conrad <adconrad@0c3.net>
Date: Sat Nov 24 23:58:38 2012 -0700
Fix C++ header directory detection for non-standard paths.
Stop assuming specific path layouts for C++ headers, and instead
use an autodetection method that looks for paths with '/[cg]++'
in the g++ include list.
diff --git a/ChangeLog b/ChangeLog
index b4f6e06..bca890a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-24 Adam Conrad <adconrad@0c3.net>
+
+ * configure.in: Autodetect C++ header directories.
+ * configure: Regenerated.
+
2012-11-23 Mike Frysinger <vapier@gentoo.org>
* elf/Makefile ($(objpfx)ld.so): Change readelf to $(READELF).
diff --git a/configure b/configure
index ff2d34c..8799b7d 100755
--- a/configure
+++ b/configure
@@ -5423,12 +5423,11 @@ if test -n "$sysheaders"; then
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
if test -n "$CXX"; then
CXX_SYSINCLUDES=
- cxxmachine=`$CXX -dumpmachine 2>&5` &&
- cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
- | sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
- test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
- CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
--isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+ for cxxheaders in `$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
+ | sed -n -e '1,/#include/d' -e 's/^ \(\/.*\/[cg]++\)/\1/p'`; do
+ test "x$cxxheaders" != x &&
+ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders"
+ done
fi
fi
diff --git a/configure.in b/configure.in
index a7f7198..d369382 100644
--- a/configure.in
+++ b/configure.in
@@ -995,12 +995,11 @@ if test -n "$sysheaders"; then
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
if test -n "$CXX"; then
CXX_SYSINCLUDES=
- cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
- cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
- | sed -n -e '1,/#include/d' -e '/^ \//{p;q;}' | sed 's/ //'`
- test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
- CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
--isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
+ for cxxheaders in `$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \
+ | sed -n -e '1,/#include/d' -e 's/^ \(\/.*\/[cg]++\)/\1/p'`; do
+ test "x$cxxheaders" != x &&
+ CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders"
+ done
fi
fi
AC_SUBST(SYSINCLUDES)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
configure | 11 +++++------
configure.in | 11 +++++------
3 files changed, 15 insertions(+), 12 deletions(-)
hooks/post-receive
--
GNU C Library master sources