diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2007-03-06 15:50:28 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2007-03-06 15:50:28 +0000 |
| commit | 14da607343d7637050c36ee3d338156dcc431354 (patch) | |
| tree | 8c9042406cd938c21327303d5cf16abd1b592581 /gcc/cppdefault.c | |
| parent | 4e669430fe3291fa26128e18c6083d0b0e61d9a3 (diff) | |
| download | gcc-14da607343d7637050c36ee3d338156dcc431354.zip gcc-14da607343d7637050c36ee3d338156dcc431354.tar.gz gcc-14da607343d7637050c36ee3d338156dcc431354.tar.bz2 | |
re PR bootstrap/31020 (cannot write in </test/gnu/gcc/objdir/prev-gcc/../gcc/./include>)
fixincludes:
* mkheaders.in: Fix headers for each multilib required.
gcc:
PR bootstrap/31020
* configure.ac (CROSS_SYSTEM_HEADER_DIR, build_system_header_dir):
Define using $${sysroot_headers_suffix}.
* configure: Regenerate.
* cppdefault.c (cpp_include_defaults): Make FIXED_INCLUDE_DIR a
multilib-suffixed directory if SYSROOT_HEADERS_SUFFIX_SPEC
defined.
* doc/invoke.texi (-print-sysroot-headers-suffix): Document.
* gcc.c (print_sysroot_headers_suffix): New.
(option_map): Include --print-sysroot-headers-suffix.
(display_help): Mention -print-sysroot-headers-suffix.
(process_command): Handle -print-sysroot-headers-suffix.
(do_spec_1): Append multilib directory to include-fixed path if
sysroot suffixes in use.
(main): Handle -print-sysroot-headers-suffix.
* Makefile.in (start.encap): Don't depend on xlimits.h
(xlimits.h): Remove.
(stmp-int-hdrs): Don't depend on xlimits.h. Inline generation of
limits.h for each multilib in fixinc_list.
(fixinc_list, s-fixinc_list): New.
(stmp-fixinc): Depend on fixinc_list. If not copying headers,
generate them for each multilib in fixinc_list.
(stmp-fixproto): Use include-fixed. Run fixproto for each
multilib in fixinc_list.
(mostlyclean): Don't remove xlimits.h.
(clean): Remove include-fixed.
(real-install-headers-tar, real-install-headers-cpio,
real-install-headers-cp): Don't copy include, only include-fixed.
(install-mkheaders): Depend on fixinc_list. Don't depend on
xlimits.h. Save limits.h files for each multilib in fixinc_list.
Always save mkinstalldirs. Preserve ${sysroot_headers_suffix} in
SYSTEM_HEADER_DIR setting in mkheaders.conf.
From-SVN: r122620
Diffstat (limited to 'gcc/cppdefault.c')
| -rw-r--r-- | gcc/cppdefault.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c index afe358e..597988e 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c @@ -71,7 +71,15 @@ const struct default_include cpp_include_defaults[] #endif #ifdef FIXED_INCLUDE_DIR /* This is the dir for fixincludes. */ - { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, + { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, + /* A multilib suffix needs adding if different multilibs use + different headers. */ +#ifdef SYSROOT_HEADERS_SUFFIX_SPEC + 1 +#else + 0 +#endif + }, #endif #ifdef CROSS_INCLUDE_DIR /* One place the target system's headers might be. */ |