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/Makefile.in | |
| parent | b0c99997cc8ea804facfab420f1d7d1a0ecdbac6 (diff) | |
| download | gcc-17719d0974f0a12327950bf25550579d9f7914cc.zip gcc-17719d0974f0a12327950bf25550579d9f7914cc.tar.gz gcc-17719d0974f0a12327950bf25550579d9f7914cc.tar.bz2 | |
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/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 33e1569..a03bb93 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -615,6 +615,7 @@ gcc_tooldir = @gcc_tooldir@ build_tooldir = $(exec_prefix)/$(target_noncanonical) # Directory in which the compiler finds target-independent g++ includes. gcc_gxx_include_dir = @gcc_gxx_include_dir@ +gcc_gxx_include_dir_add_sysroot = @gcc_gxx_include_dir_add_sysroot@ # Directory to search for site-specific includes. local_includedir = $(local_prefix)/include includedir = $(prefix)/include @@ -3980,6 +3981,7 @@ PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ |