diff options
| author | Bernd Schmidt <bernd.schmidt@analog.com> | 2006-05-17 13:54:38 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2006-05-17 13:54:38 +0000 |
| commit | be448346aa660311b2cb932c082b101bc1cf504b (patch) | |
| tree | a385159e4118c650300beb9f5557e65775ac052b | |
| parent | 2e3b8fe7b5405a94d86bfa323c0e80e83c58d784 (diff) | |
| download | gcc-be448346aa660311b2cb932c082b101bc1cf504b.zip gcc-be448346aa660311b2cb932c082b101bc1cf504b.tar.gz gcc-be448346aa660311b2cb932c082b101bc1cf504b.tar.bz2 | |
re PR bootstrap/22541 (Building into empty PREFIX causes broken limits.h to be installed)
PR bootstrap/22541
From Dan Kegel <dank@kegel.com>:
* Makefile.in: Strip "dir/../" combinations from SYSTEM_INCLUDE_DIR.
From-SVN: r113859
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1f1f7fd..eefaa9a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-05-17 Bernd Schmidt <bernd.schmidt@analog.com> + + PR bootstrap/22541 + From Dan Kegel <dank@kegel.com>: + * Makefile.in: Strip "dir/../" combinations from SYSTEM_INCLUDE_DIR. + 2006-05-17 Eric Botcazou <ebotcazou@adacore.com> * tree.c (variably_modified_type_p) <ARRAY_TYPE>: Return true diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 5e9497b..4aa1967 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -397,7 +397,10 @@ NATIVE_SYSTEM_HEADER_DIR = /usr/include CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ # autoconf sets SYSTEM_HEADER_DIR to one of the above. -SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@ +# Purge it of unneccessary internal relative paths +# to directories that might not exist yet. +# The sed idiom for this is to repeat the search-and-replace until it doesn't match, using :a ... ta. +SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta` # Control whether to run fixproto and fixincludes. STMP_FIXPROTO = @STMP_FIXPROTO@ @@ -3211,13 +3214,16 @@ s-macro_list : $(GCC_PASSES) ../$(build_subdir)/fixincludes/fixincl: ; @ : # Build fixed copies of system files. +# Abort if no system headers available, unless building a crosscompiler. +# FIXME: abort unless building --without-headers would be more accurate and less ugly stmp-fixinc: gsyslimits.h macro_list \ $(build_objdir)/fixincludes/fixincl \ $(build_objdir)/fixincludes/fixinc.sh @if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \ echo The directory that should contain system headers does not exist: >&2 ; \ echo " ${SYSTEM_HEADER_DIR}" >&2 ; \ - if test "x${SYSTEM_HEADER_DIR}" = "x${gcc_tooldir}/sys-include"; \ + tooldir_sysinc=`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`; \ + if test "x${SYSTEM_HEADER_DIR}" = "x${tooldir_sysinc}"; \ then sleep 1; else exit 1; fi; \ fi rm -rf include; mkdir include |