From 17719d0974f0a12327950bf25550579d9f7914cc Mon Sep 17 00:00:00 2001 From: Han Shen Date: Fri, 6 Jan 2012 00:14:32 +0000 Subject: 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 --- gcc/cppdefault.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gcc/cppdefault.c') 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. */ -- cgit v1.2.1