diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-21 09:16:03 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-21 09:16:03 +0000 |
| commit | 0bf9691e11a3ff372150e7fe8a409b77a4f584c1 (patch) | |
| tree | 71cd1bbb2b1bef621cae5bc07f81ff0dd80bb65a /gcc/configure.ac | |
| parent | f1e89bc3407002bf7342326be7f9167d316fa624 (diff) | |
| download | gcc-0bf9691e11a3ff372150e7fe8a409b77a4f584c1.tar.gz | |
* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When
cross-compiling, put headers in $prefix/$target/include/c++.
* configure: Regenerated.
* configure.ac: Set gcc_gxx_include_dir to $target/include/c++
when cross-compiling. Do not substitute libstdcxx_incdir.
* configure: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114845 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure.ac')
| -rw-r--r-- | gcc/configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac index 7a490dd65ef..de3d065b8b2 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -132,13 +132,17 @@ no) ;; *) gcc_gxx_include_dir=$with_gxx_include_dir ;; esac]) +# This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO. if test x${gcc_gxx_include_dir} = x; then if test x${enable_version_specific_runtime_libs} = xyes; then gcc_gxx_include_dir='${libsubdir}/include/c++' else - libstdcxx_incdir='c++/$(version)' + libstdcxx_incdir='include/c++/$(version)' + if test x$host != x$target; then + libstdcxx_incdir="$target_alias/$libstdcxx_incdir" + fi changequote(<<, >>)dnl - gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir} + gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/$libstdcxx_incdir" changequote([, ])dnl fi fi @@ -3576,7 +3580,6 @@ AC_SUBST(extra_programs) AC_SUBST(float_h_file) AC_SUBST(gcc_config_arguments) AC_SUBST(gcc_gxx_include_dir) -AC_SUBST(libstdcxx_incdir) AC_SUBST(host_exeext) AC_SUBST(host_xm_file_list) AC_SUBST(host_xm_include_list) |