From c684482df781c15e444220aceba4b9fd2a3f2629 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 25 Jul 2006 08:39:57 +0000 Subject: Sync from GCC 2006-07-04 Eric Botcazou PR bootstrap/18058 * configure.in: Add -fkeep-inline-functions to CFLAGS for stage 1 if the bootstrap compiler is a GCC version that supports it. * configure: Regenerate. config: 2006-07-21 David Daney PR libgcj/28426 * gxx-include-dir.m4: Use target_alias in path for cross build. --- config/ChangeLog | 5 +++++ config/gxx-include-dir.m4 | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/ChangeLog b/config/ChangeLog index 55ea2e2..bf0c5d6 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -9,6 +9,11 @@ PR target/26792 * unwind_ipinfo.m4: New. + 2006-07-21 David Daney + + PR libgcj/28426 + * gxx-include-dir.m4: Use target_alias in path for cross build. + 2006-07-18 Paolo Bonzini * acx.m4: Support --with-build-libsubdir and AC_SUBST diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 0e6e4ff..4f54d42 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 -- cgit v1.1