diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2006-07-25 12:39:57 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2006-07-25 12:39:57 +0400 |
| commit | c684482df781c15e444220aceba4b9fd2a3f2629 (patch) | |
| tree | 3ab3cdce82529d24e4e802dce0fb5f9504aba5c5 /config | |
| parent | aee7eefa4df20635befcfa3b8919ffccad3c7c35 (diff) | |
Sync from GCC
2006-07-04 Eric Botcazou <ebotcazou@libertysurf.fr>
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 <ddaney@avtrex.com>
PR libgcj/28426
* gxx-include-dir.m4: Use target_alias in path for cross build.
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 55ea2e292..bf0c5d6df 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -9,6 +9,11 @@ PR target/26792 * unwind_ipinfo.m4: New. + 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 0e6e4ffc3..4f54d427f 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 |