diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2006-06-21 09:16:03 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2006-06-21 09:16:03 +0000 |
| commit | 0f57bf40b889941ee61338063068f50d73e8d86d (patch) | |
| tree | 71cd1bbb2b1bef621cae5bc07f81ff0dd80bb65a /libstdc++-v3 | |
| parent | 5d7b51995eab6b609a1f1e58dc3e3f5a5df73b8d (diff) | |
| download | gcc-0f57bf40b889941ee61338063068f50d73e8d86d.zip gcc-0f57bf40b889941ee61338063068f50d73e8d86d.tar.gz gcc-0f57bf40b889941ee61338063068f50d73e8d86d.tar.bz2 | |
acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When cross-compiling, put headers in $prefix/$target/include/c++.
* 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.
From-SVN: r114845
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 9 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 8 |
3 files changed, 21 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a5b5ef1..2dd6ad8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2006-06-21 Mark Mitchell <mark@codesourcery.com> + + * acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When + cross-compiling, put headers in $prefix/$target/include/c++. + * configure: Regenerated. + 2006-06-20 Paolo Carlini <pcarlini@suse.de> * include/tr1/random.tcc (struct _Private::_Mod_w<>, diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index f58a84f..3495664 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. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 1c2698d..46858e7 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -110162,7 +110162,13 @@ echo "${ECHO_T}$version_specific_libs" >&6 # 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. |