yann@1
|
1 |
See http://gcc.gnu.org/PR22541
|
yann@1
|
2 |
|
yann@1
|
3 |
From: Dan Kegel
|
yann@1
|
4 |
|
yann@1
|
5 |
When building gcc-3.4.3 or gcc-4.0.[01] into a clean $PREFIX (the only two I've tried like this),
|
yann@1
|
6 |
the configure script happily copies the glibc include files from include to sys-include;
|
yann@1
|
7 |
here's the line from the log file (with $PREFIX instead of the real prefix):
|
yann@1
|
8 |
|
yann@1
|
9 |
Copying $PREFIX/i686-unknown-linux-gnu/include to $PREFIX/i686-unknown-linux-gnu/sys-include
|
yann@1
|
10 |
|
yann@1
|
11 |
But later, when running fixincludes, it gives the error message
|
yann@1
|
12 |
The directory that should contain system headers does not exist:
|
yann@1
|
13 |
$PREFIX/lib/gcc/i686-unknown-linux-gnu/3.4.3/../../../../i686-unknown-linux-gnu/sys-include
|
yann@1
|
14 |
|
yann@1
|
15 |
Nevertheless, it continues building; the header files it installs in
|
yann@1
|
16 |
$PREFIX/lib/gcc/i686-unknown-linux-gnu/3.4.3/include
|
yann@1
|
17 |
do not include the boilerplate that would cause it to #include_next the
|
yann@1
|
18 |
glibc headers in the system header directory.
|
yann@1
|
19 |
Thus the resulting toolchain can't compile the following program:
|
yann@1
|
20 |
#include <limits.h>
|
yann@1
|
21 |
int x = PATH_MAX;
|
yann@1
|
22 |
because its limits.h doesn't include the glibc header.
|
yann@1
|
23 |
|
yann@1
|
24 |
That's not nice. I suspect the problem is that gcc/Makefile.in assumes that
|
yann@1
|
25 |
it can refer to $PREFIX/i686-unknown-linux-gnu with the path
|
yann@1
|
26 |
$PREFIX/lib/../i686-unknown-linux-gnu, but
|
yann@1
|
27 |
that fails because the directory $PREFIX/lib doesn't exist during 'make all';
|
yann@1
|
28 |
it is only created later, during 'make install'. (Which makes this problem
|
yann@1
|
29 |
confusing, since one only notices the breakage well after 'make install',
|
yann@1
|
30 |
at which point the path configure complained about does exist, and has the
|
yann@1
|
31 |
right stuff in it.)
|
yann@1
|
32 |
|
yann@1
|
33 |
A possible fix is to replace the line in gcc/Makefile.in that says
|
yann@1
|
34 |
SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@
|
yann@1
|
35 |
with a version that gets rid of extra ..'s, e.g.
|
yann@1
|
36 |
SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e "s,[^/]*/\.\.\/,,;ta"`
|
yann@1
|
37 |
(hey, that's the first time I've ever used a label in a sed script; thanks to the sed faq
|
yann@1
|
38 |
for explaining the :a ... ta method of looping to repeat a search-and-replace until it doesn't match.)
|
yann@1
|
39 |
|
yann@1
|
40 |
[rediffed against gcc-4.0.0]
|
yann@1
|
41 |
|
yann@1
|
42 |
--- gcc-4.0.0/gcc/Makefile.in.orig 2005-04-04 12:45:13.000000000 -0700
|
yann@1
|
43 |
+++ gcc-4.0.0/gcc/Makefile.in 2005-05-20 12:33:43.000000000 -0700
|
yann@1
|
44 |
@@ -378,7 +378,10 @@
|
yann@1
|
45 |
CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
|
yann@1
|
46 |
|
yann@1
|
47 |
# autoconf sets SYSTEM_HEADER_DIR to one of the above.
|
yann@1
|
48 |
-SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@
|
yann@1
|
49 |
+# Purge it of unneccessary internal relative paths
|
yann@1
|
50 |
+# to directories that might not exist yet.
|
yann@1
|
51 |
+# The sed idiom for this is to repeat the search-and-replace until it doesn't match, using :a ... ta.
|
yann@1
|
52 |
+SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`
|
yann@1
|
53 |
|
yann@1
|
54 |
# Control whether to run fixproto and fixincludes.
|
yann@1
|
55 |
STMP_FIXPROTO = @STMP_FIXPROTO@
|
yann@1
|
56 |
@@ -2838,13 +2841,15 @@
|
yann@1
|
57 |
../$(build_subdir)/fixincludes/fixincl: ; @ :
|
yann@1
|
58 |
|
yann@1
|
59 |
# Build fixed copies of system files.
|
yann@1
|
60 |
+# Abort if no system headers available, unless building a crosscompiler.
|
yann@1
|
61 |
+# FIXME: abort unless building --without-headers would be more accurate and less ugly
|
yann@1
|
62 |
stmp-fixinc: gsyslimits.h macro_list \
|
yann@1
|
63 |
../$(build_subdir)/fixincludes/fixincl \
|
yann@1
|
64 |
../$(build_subdir)/fixincludes/fixinc.sh
|
yann@1
|
65 |
@if test ! -d ${SYSTEM_HEADER_DIR}; then \
|
yann@1
|
66 |
echo The directory that should contain system headers does not exist: >&2 ; \
|
yann@1
|
67 |
echo " ${SYSTEM_HEADER_DIR}" >&2 ; \
|
yann@1
|
68 |
- if test "x${SYSTEM_HEADER_DIR}" = "x${gcc_tooldir}/sys-include"; \
|
yann@1
|
69 |
+ if test "x${SYSTEM_HEADER_DIR}" = "x`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`"; \
|
yann@1
|
70 |
then sleep 1; else exit 1; fi; \
|
yann@1
|
71 |
fi
|
yann@1
|
72 |
rm -rf include; mkdir include
|