From: "H.J. Lu" <hjl.tools@gmail.com>
To: GNU C Library <libc-alpha@sourceware.org>
Subject: [PATCH] Make copy of <bits/std_abs.h> from GCC 7 [BZ #21573]
Date: Tue, 13 Jun 2017 11:38:00 -0000 [thread overview]
Message-ID: <20170613113813.GA7656@gmail.com> (raw)
<bits/std_abs.h> from GCC 7 will include /usr/include/stdlib.h from
"#include_next" (instead of stdlib/stdlib.h in the glibc source
directory), and this turns up as a make dependency. Also make a copy
of <bits/std_abs.h> to prevent it from including /usr/include/stdlib.h.
OK for master?
H.J.
---
[BZ #21573]
* configure.ac (find_cxx_header): Add a second argument to
support <bits/std_abs.h>.
(CXX_CSTDLIB_HEADER): Updated. Also make a copy of
<bits/std_abs.h>.
(CXX_CMATH_HEADER): Updated.
* configure: Regenerated.
---
configure | 9 ++++++---
configure.ac | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 422482f..888224e 100755
--- a/configure
+++ b/configure
@@ -5336,10 +5336,13 @@ fi
# copy of those headers in Makerules.
if test -n "$CXX"; then
find_cxx_header () {
- echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
+ echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$2:/{s/:\$//;p}"
}
- CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
- CXX_CMATH_HEADER="$(find_cxx_header cmath)"
+ CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib cstdlib)"
+ # Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from
+ # including /usr/include/stdlib.h.
+ CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h bits\\\/std_abs.h)"
+ CXX_CMATH_HEADER="$(find_cxx_header cmath cmath)"
fi
diff --git a/configure.ac b/configure.ac
index 7f43042..00cf227 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1187,10 +1187,13 @@ 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++ - | sed -n "/$1:/{s/:\$//;p}"
+ echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$2:/{s/:\$//;p}"
}
- CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
- CXX_CMATH_HEADER="$(find_cxx_header cmath)"
+ CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib cstdlib)"
+ # Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from
+ # including /usr/include/stdlib.h.
+ CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h bits\\\/std_abs.h)"
+ CXX_CMATH_HEADER="$(find_cxx_header cmath cmath)"
fi
AC_SUBST(CXX_CSTDLIB_HEADER)
AC_SUBST(CXX_CMATH_HEADER)
--
2.9.4
next reply other threads:[~2017-06-13 11:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 11:38 H.J. Lu [this message]
2017-06-13 11:40 ` Andreas Schwab
2017-06-13 11:44 ` H.J. Lu
2017-06-13 11:46 ` Andreas Schwab
2017-06-13 11:54 ` H.J. Lu
2017-06-13 15:32 ` H.J. Lu
2017-06-13 18:13 ` H.J. Lu
2017-06-13 20:13 ` Florian Weimer
2017-06-13 20:21 ` H.J. Lu
2017-09-07 17:29 ` H.J. Lu
2017-09-11 15:53 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170613113813.GA7656@gmail.com \
--to=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).