This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
libffi vs. multilibs, redux
- From: Jeff Sturm <jsturm at one-point dot com>
- To: java-patches at gcc dot gnu dot org
- Cc: tromey at redhat dot com
- Date: Sun, 21 Jul 2002 15:27:46 -0400 (EDT)
- Subject: libffi vs. multilibs, redux
As noted in http://gcc.gnu.org/ml/gcc/2002-07/msg00896.html. This
reverts a patch from over 2 years ago:
http://gcc.gnu.org/ml/java-patches/2000-q1/msg00078.html
Tom, can you remember why it was needed? It seems to me that
$(top_builddir)/../libffi must always exist from any multilib libjava.
As it is now, my 64-bit build includes ffi.h from the 32-bit build,
breaking the bytecode interpreter.
Bootstrapped & tested on sparc-sun-solaris2.8.
2002-07-21 Jeff Sturm <jsturm@one-point.com>
* configure.in (LIBFFIINCS): Don't prepend MULTIBUILDTOP.
* configure: Rebuilt.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.136
diff -u -p -r1.136 configure.in
--- configure.in 10 Jul 2002 14:30:15 -0000 1.136
+++ configure.in 21 Jul 2002 18:43:13 -0000
@@ -196,7 +196,7 @@ LIBFFIINCS=
if test "$with_libffi" != no; then
AC_DEFINE(USE_LIBFFI)
LIBFFI=../libffi/libffi_convenience.la
- LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include'
+ LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I../libffi/include'
fi
AC_SUBST(LIBFFI)
AC_SUBST(LIBFFIINCS)