diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-06-13 09:28:14 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-06-13 10:53:45 -0700 |
| commit | a65ea28d1833d3502c5070472e43bda04410e6b5 (patch) | |
| tree | 0f8a11710846aa61d89ce64a740a6c2798531f89 /configure | |
| parent | 70ec56e9f21ac798ab13019e7000c5d0abf6911d (diff) | |
| download | glibc-a65ea28d1833d3502c5070472e43bda04410e6b5.tar.gz glibc-a65ea28d1833d3502c5070472e43bda04410e6b5.tar.xz glibc-a65ea28d1833d3502c5070472e43bda04410e6b5.zip | |
Make copy of <bits/std_abs.h> from GCC 7 [BZ #21573]
<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. [BZ #21573] * Makerules [$(c++-bits-std_abs-h) != ""] (before-compile): Add $(common-objpfx)bits/std_abs.h. [$(c++-bits-std_abs-h) != ""] ($(common-objpfx)bits/std_abs.h): New target. * config.make.in (c++-bits-std_abs-h): New. * configure.ac (find_cxx_header): Use "\,$1," with sed. (CXX_BITS_STD_ABS_H): New. (AC_SUBST(CXX_BITS_STD_ABS_H)): Likewise. * configure: Regenerated.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure index 422482f355..ceb53949ba 100755 --- a/configure +++ b/configure @@ -634,6 +634,7 @@ BISON INSTALL_INFO PERL BASH_SHELL +CXX_BITS_STD_ABS_H CXX_CMATH_HEADER CXX_CSTDLIB_HEADER CXX_SYSINCLUDES @@ -5336,14 +5337,16 @@ 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 "\,$1:,{s/:\$//;p}" } 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 + # Test if LD_LIBRARY_PATH contains the notation for the current directory # since this would lead to problems installing/building glibc. # LD_LIBRARY_PATH contains the current directory if one of the following |