diff options
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 |