This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch google/grte/v5-2.27/master updated. glibc-2.27-148-g2248ae2


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, google/grte/v5-2.27/master has been updated
       via  2248ae2b24dedfcc6c549deea21af581bddef42e (commit)
      from  83c02e85d756622f37d046a3d168e755b4e9b44b (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2248ae2b24dedfcc6c549deea21af581bddef42e

commit 2248ae2b24dedfcc6c549deea21af581bddef42e
Author: Stan Shebs <stanshebs@google.com>
Date:   Mon Sep 24 15:31:31 2018 -0700

    Add clang version of find_cxx_header

diff --git a/configure b/configure
index 0c64f96..9591958 100755
--- a/configure
+++ b/configure
@@ -5365,10 +5365,19 @@ fi
 # Obtain some C++ header file paths.  This is used to make a local
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
+  # In theory the clang and gcc regexes can be merged, but the
+  # result is incomprehensible.
+  if test "$with_clang" != no; then
+  find_cxx_header () {
+    echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
+	 | sed -n "\,^[o.-]*[ :] /.*/$1 [\]$,{s,^[o.-]*[ :] /,/,;s/ [\]$//;p}"
+  }
+  else
   find_cxx_header () {
     echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
 	 | sed -n "\,$1:,{s/:\$//;p}"
   }
+  fi
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
   CXX_BITS_STD_ABS_H="$(find_cxx_header bits/std_abs.h)"
diff --git a/configure.ac b/configure.ac
index 9899b3d..cb6fb33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1067,15 +1067,26 @@ AC_SUBST(CXX_SYSINCLUDES)
 
 # Obtain some C++ header file paths.  This is used to make a local
 # copy of those headers in Makerules.
+changequote(,)dnl
 if test -n "$CXX"; then
+  # In theory the clang and gcc regexes can be merged, but the
+  # result is incomprehensible.
+  if test "$with_clang" != no; then
+  find_cxx_header () {
+    echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
+	 | sed -n "\,^[o.-]*[ :] /.*/$1 [\]$,{s,^[o.-]*[ :] /,/,;s/ [\]$//;p}"
+  }
+  else
   find_cxx_header () {
     echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
 	 | sed -n "\,$1:,{s/:\$//;p}"
   }
+  fi
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
   CXX_BITS_STD_ABS_H="$(find_cxx_header bits/std_abs.h)"
 fi
+changequote([,])dnl
 AC_SUBST(CXX_CSTDLIB_HEADER)
 AC_SUBST(CXX_CMATH_HEADER)
 AC_SUBST(CXX_BITS_STD_ABS_H)

-----------------------------------------------------------------------

Summary of changes:
 configure    |    9 +++++++++
 configure.ac |   11 +++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]