From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
 id DDE403857362; Fri, 29 Apr 2022 14:01:48 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DDE403857362
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/azanella/clang] Rewrite find_cxx_header config configure.ac
X-Act-Checkin: glibc
X-Git-Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
X-Git-Refname: refs/heads/azanella/clang
X-Git-Oldrev: 7d1b3815a4c26bbbbcabff3092dcd41693f109e9
X-Git-Newrev: 1fd2dc8dbf59d4632996d50b7fc89ba85824b9de
Message-Id: <20220429140148.DDE403857362@sourceware.org>
Date: Fri, 29 Apr 2022 14:01:48 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Apr 2022 14:01:49 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1fd2dc8dbf59d4632996d50b7fc89ba85824b9de

commit 1fd2dc8dbf59d4632996d50b7fc89ba85824b9de
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Tue Mar 8 16:40:35 2022 -0300

    Rewrite find_cxx_header config configure.ac
    
    To work with clang++.

Diff:
---
 configure    | 4 ++--
 configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 93fd33be7f..ee00e7fac5 100755
--- a/configure
+++ b/configure
@@ -5580,8 +5580,8 @@ fi
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
   find_cxx_header () {
-    echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
-	 | sed -n "\,$1:,{s/:\$//;p}"
+    echo "#include <$1>" | $CXX -H -fsyntax-only -x c++ - 2>&1 \
+	 | sed -rn "\,^\.? .,{s/^\.*\. //p}"
   }
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
diff --git a/configure.ac b/configure.ac
index a9e4bccaf6..737e842014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,8 +1136,8 @@ AC_SUBST(CXX_SYSINCLUDES)
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
   find_cxx_header () {
-    echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
-	 | sed -n "\,$1:,{s/:\$//;p}"
+    echo "#include <$1>" | $CXX -H -fsyntax-only -x c++ - 2>&1 \
+	 | sed -rn "\,^\.? .,{s/[^\.]*\. //p}"
   }
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"