diff options
| author | Daniel Jacobowitz <drow@mvista.com> | 2003-02-13 17:23:56 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@gcc.gnu.org> | 2003-02-13 17:23:56 +0000 |
| commit | 047d636f544fad604aec883b45012d59369839fe (patch) | |
| tree | 3d7379a3ec405d4e0f84ede65961991b09195727 /gcc/cppdefault.h | |
| parent | 902cf50c93298503d3966675cd01841b97c909e8 (diff) | |
Makefile.in (PREPROCESSOR_DEFINES): Add @TARGET_SYSTEM_ROOT_DEFINE@.
* Makefile.in (PREPROCESSOR_DEFINES): Add
@TARGET_SYSTEM_ROOT_DEFINE@.
* configure.in (PREFIX_INCLUDE_DIR): Don't define if $with_sysroot
is specified or if building a cross compiler.
(TARGET_SYSTEM_ROOT_DEFINE): Add TARGET_SYSTEM_ROOT_RELOCATABLE
if the sysroot is under $exec_prefix.
* configure: Regenerated.
* cppdefault.h: Use native include paths if TARGET_SYSTEM_ROOT is
defined.
(struct default_include): Add add_sysroot field.
(cpp_SYSROOT): Declare.
* cppdefault.c (cpp_include_defaults): Fill in add_sysroot
field.
(cpp_SYSROOT): New variable.
* cppinit.c (cpp_create_reader): Initialize
CPP_OPTION (pfile, sysroot).
(init_standard_includes): Handle add_sysroot. Do not
add unrelocated copies of relocated directories.
(COMMAND_LINE_OPTIONS): Add -isysroot.
(cpp_handle_option): Handle -isysroot.
* cpplib.h (struct cpp_options): Add sysroot member.
* gcc.c (The Specs Language): Update description of %I.
(target_system_root_changed): New variable.
(process_command): Conditionalize make_relative_prefix call
on !VMS and TARGET_SYSTEM_ROOT_RELOCATABLE. Set
target_system_root_changed.
(do_spec_1): Add -isysroot to %I.
* doc/invoke.texi (Spec Files): Update description of %I.
* doc/install.texi (--with-sysroot): Update comment about
relocation.
From-SVN: r62853
Diffstat (limited to 'gcc/cppdefault.h')
| -rw-r--r-- | gcc/cppdefault.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h index 40a860964a8..c87e27d5dee 100644 --- a/gcc/cppdefault.h +++ b/gcc/cppdefault.h @@ -34,12 +34,12 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define STANDARD_INCLUDE_COMPONENT 0 #endif -#ifdef CROSS_COMPILE -#undef LOCAL_INCLUDE_DIR -#undef SYSTEM_INCLUDE_DIR -#undef STANDARD_INCLUDE_DIR +#if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT) +# undef LOCAL_INCLUDE_DIR +# undef SYSTEM_INCLUDE_DIR +# undef STANDARD_INCLUDE_DIR #else -#undef CROSS_INCLUDE_DIR +# undef CROSS_INCLUDE_DIR #endif /* This is the default list of directories to search for include files. @@ -61,10 +61,14 @@ struct default_include const int cxx_aware; /* Includes in this directory don't need to be wrapped in extern "C" when compiling C++. */ + const int add_sysroot; /* FNAME should be prefixed by + cpp_SYSROOT. */ }; extern const struct default_include cpp_include_defaults[]; extern const char cpp_GCC_INCLUDE_DIR[]; extern const size_t cpp_GCC_INCLUDE_DIR_len; +extern const char *cpp_SYSROOT; + #endif /* ! GCC_CPPDEFAULT_H */ |