diff options
| author | David Daney <ddaney@avtrex.com> | 2006-07-21 20:49:06 +0000 |
|---|---|---|
| committer | David Daney <ddaney@avtrex.com> | 2006-07-21 20:49:06 +0000 |
| commit | a7dc1985020361488138f564014c9a712119abd6 (patch) | |
| tree | 9fcd0f6a9d2462c3af8f610d3c9c28c9c15dccc1 /config | |
| parent | c7c26a40753d69741644155782b4d0406c510940 (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@115650 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/gxx-include-dir.m4 | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 7aaf7cae36a..46070e8c3c9 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -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 diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 0e6e4ffc397..4f54d427f7e 100644 --- a/config/gxx-include-dir.m4 +++ b/config/gxx-include-dir.m4 @@ -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 |