[gcj-eclipse-merge-branch] fix cross-build configury/makery

[Andrew Haley]

Adam Megacz writes:
 > 
 > ok to commit?
 > 
 >   - a
 > 
 > 2006-12-04  Adam Megacz <megacz@cs.berkeley.edu>
 > 
 >         * Makefile.am: add libgcj-$(gcc_version).jar to -fclasspath=
 >         * configure.ac: change settings for GCJ and GCJFLAGS to fix
 >         cross-builds
 > 
 > Index: Makefile.am
 > ===================================================================
 > --- Makefile.am (revision 119526)
 > +++ Makefile.am (working copy)
 > @@ -139,7 +139,7 @@
 >  
 >  AM_GCJFLAGS = \
 >         @LIBGCJ_JAVAFLAGS@ \
 > -       -fclasspath= -fbootclasspath=$(BOOTCLASSPATH) \
 > +       -fclasspath=libgcj-$(gcc_version).jar -fbootclasspath=$(BOOTCLASSPATH) \
 >         --encoding=UTF-8 \
 >         -Wno-deprecated -fbootstrap-classes
 >  
 > Index: configure.ac
 > ===================================================================
 > --- configure.ac        (revision 119526)
 > +++ configure.ac        (working copy)
 > @@ -355,14 +355,16 @@
 >        if test "x${with_newlib}" = "xyes"; then
 >           # FIXME (comment): Why is this needed?
 >           GCC_UNWIND_INCLUDE=
 > -         GCJ="${target_noncanonical}-gcj"
 > +         GCJ="$built_gcc_dir/${target_noncanonical}-gcj"

This change shouldn't be necessary.  I think it's related to a bug
that tromey is working on.

Andrew.


 >        else
 > -         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
 > +         GCJ="$built_gcc_dir/${target_noncanonical}-gcj"
 > +         GCJFLAGS="-B$built_gcc_dir/ $GCJFLAGS"
 >        fi
 >        GCJH='$(target_noncanonical)-gcjh'
 >     ;;
 >     path)
 > -      GCJ="gcj -B`${PWDCMD-pwd}`/"
 > +      GCJ="$built_gcc_dir/gcj"
 > +      GCJFLAGS="-B$built_gcc_dir/ $GCJFLAGS"
 >        GCJH=gcjh
 >     ;;
 >  esac