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 /libstdc++-v3/acinclude.m4 | |
| 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 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index f58a84fc05a..349566466ac 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -674,6 +674,7 @@ dnl dnl Assumes cross_compiling bits already done, and with_cross_host in dnl particular. dnl +dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir. AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [ glibcxx_toolexecdir=no glibcxx_toolexeclibdir=no @@ -705,7 +706,13 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [ # Default case for install directory for include files. if test $version_specific_libs = no && test $gxx_include_dir = no; then - gxx_include_dir='${prefix}/include/c++/${gcc_version}' + gxx_include_dir='include/c++/${gcc_version}' + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir" + else + gxx_include_dir='${prefix}/'"$gxx_include_dir" + fi fi # Version-specific runtime libs processing. |