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 /Makerules | |
| parent | 70ec56e9f21ac798ab13019e7000c5d0abf6911d (diff) | |
| download | glibc-a65ea28d1833d3502c5070472e43bda04410e6b5.zip glibc-a65ea28d1833d3502c5070472e43bda04410e6b5.tar.gz glibc-a65ea28d1833d3502c5070472e43bda04410e6b5.tar.bz2 | |
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 'Makerules')
| -rw-r--r-- | Makerules | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -134,6 +134,14 @@ $(common-objpfx)cstdlib: $(c++-cstdlib-header) $(common-objpfx)cmath: $(c++-cmath-header) $(INSTALL_DATA) $< $@T $(move-if-change) $@T $@ +ifneq (,$(c++-bits-std_abs-h)) +# Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from +# including /usr/include/stdlib.h. +before-compile := $(common-objpfx)bits/std_abs.h $(before-compile) +$(common-objpfx)bits/std_abs.h: $(c++-bits-std_abs-h) + $(INSTALL_DATA) $< $@T + $(move-if-change) $@T $@ +endif endif before-compile := $(common-objpfx)libc-abis.h $(before-compile) |