diff options
| author | shenhan <shenhan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-06 00:14:32 +0000 |
|---|---|---|
| committer | shenhan <shenhan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-06 00:14:32 +0000 |
| commit | 36ddd5fe5d2272ef4f685d66e1c937e95a8c6c2d (patch) | |
| tree | aecf81e21c34cee9bcacb5cb76b633e096d4f169 /gcc/configure | |
| parent | aa848e4769c62c66e95398612b9470020bfde6c1 (diff) | |
| download | gcc-36ddd5fe5d2272ef4f685d66e1c937e95a8c6c2d.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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182938 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gcc/configure b/gcc/configure index ba6156f0087..4dd9faa335f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -637,6 +637,7 @@ host_xm_defines host_xm_include_list host_xm_file_list host_exeext +gcc_gxx_include_dir_add_sysroot gcc_gxx_include_dir gcc_config_arguments float_h_file @@ -3313,6 +3314,15 @@ if test x${gcc_gxx_include_dir} = x; then fi fi +gcc_gxx_include_dir_add_sysroot=0 +if test "${with_sysroot+set}" = set; then + gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` + if test "${gcc_gxx_without_sysroot}"; then + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" + gcc_gxx_include_dir_add_sysroot=1 + fi +fi + # Check whether --with-cpp_install_dir was given. if test "${with_cpp_install_dir+set}" = set; then : @@ -18106,7 +18116,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18109 "configure" +#line 18119 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18212,7 +18222,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18215 "configure" +#line 18225 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -27054,6 +27064,7 @@ fi + # Echo link setup. if test x${build} = x${host} ; then if test x${host} = x${target} ; then |