re PR libgcj/28426 (libgcj header files installed in wrong location in cross build)

libstdc++-v3/
	PR libgcj/28426
	* acinclude.m4: Added a comment.
config/
	PR libgcj/28426
	* gxx-include-dir.m4: Use target_alias in path for cross build.
libjava/
	PR libgcj/28426
	* configure: Regenerated.

From-SVN: r115650
This commit is contained in:
David Daney 2006-07-21 20:49:06 +00:00 committed by David Daney
parent dfb84d6233
commit 505692b0cd
6 changed files with 30 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2006-07-21 David Daney <ddaney@avtrex.com>
PR libgcj/28426
* gxx-include-dir.m4: Use target_alias in path for cross build.
2006-07-18 Paolo Bonzini <bonzini@gnu.org>
* acx.m4: Support --with-build-libsubdir and AC_SUBST

View File

@ -17,7 +17,13 @@ case "${with_gxx_include_dir}" in
yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
*)
libstdcxx_incdir='c++/$(gcc_version)'
gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;;
gxx_include_dir='include/$(libstdcxx_incdir)'
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;;
esac ;;
*) gxx_include_dir=${with_gxx_include_dir} ;;
esac

View File

@ -1,3 +1,8 @@
2006-07-21 David Daney <ddaney@avtrex.com>
PR libgcj/28426
* configure: Regenerated.
2006-07-21 Mark Wielaard <mark@klomp.org>
* java/io/OutputStreamWriter.java (flush): Create work if null.

8
libjava/configure vendored
View File

@ -15055,7 +15055,13 @@ echo "$as_me: error: --with-gxx-include-dir=[dir] requires a directory" >&2;}
yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
*)
libstdcxx_incdir='c++/$(gcc_version)'
gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;;
gxx_include_dir='include/$(libstdcxx_incdir)'
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;;
esac ;;
*) gxx_include_dir=${with_gxx_include_dir} ;;
esac

View File

@ -1,3 +1,8 @@
2006-07-21 David Daney <ddaney@avtrex.com>
PR libgcj/28426
* acinclude.m4: Added a comment.
2006-07-20 Benjamin Kosnik <bkoz@redhat.com>
Jakub Jelinek <jakub@redhat.com>

View File

@ -675,6 +675,7 @@ 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.
dnl config/gxx-include-dir.m4 must be kept consistant with this as well.
AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
glibcxx_toolexecdir=no
glibcxx_toolexeclibdir=no