diff options
| author | Han Shen <shenhan@gcc.gnu.org> | 2012-01-06 00:14:32 +0000 |
|---|---|---|
| committer | Han Shen <shenhan@gcc.gnu.org> | 2012-01-06 00:14:32 +0000 |
| commit | 17719d0974f0a12327950bf25550579d9f7914cc (patch) | |
| tree | aecf81e21c34cee9bcacb5cb76b633e096d4f169 /gcc/cppdefault.c | |
| parent | b0c99997cc8ea804facfab420f1d7d1a0ecdbac6 (diff) | |
| download | gcc-17719d0974f0a12327950bf25550579d9f7914cc.tar.gz | |
Translate built-in include paths for sysroot.
gcc/
* Makefile.in (gcc_gxx_include_dir_add_sysroot): New.
(PREPROCESSOR_DEFINES): Define GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT.
* cppdefault.c (cpp_include_defaults): Replace hard coded "0" with
GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT for "add_sysroot" field.
* configure.ac (AC_SUBST): Add gcc_gxx_include_dir_add_sysroot to
control whether sysroot should be prepended to gxx include dir.
* configure: Regenerate.
From-SVN: r182938
Diffstat (limited to 'gcc/cppdefault.c')
| -rw-r--r-- | gcc/cppdefault.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c index 099899a7726..927083e939d 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c @@ -44,15 +44,18 @@ const struct default_include cpp_include_defaults[] = { #ifdef GPLUSPLUS_INCLUDE_DIR /* Pick up GNU C++ generic include files. */ - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0, 0 }, + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, #endif #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR /* Pick up GNU C++ target-dependent include files. */ - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0, 1 }, + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, #endif #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR /* Pick up GNU C++ backward and deprecated include files. */ - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0, 0 }, + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, #endif #ifdef GCC_INCLUDE_DIR /* This is the dir for gcc's private headers. */ |