This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


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"
       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

-- 
PGP/GPG: 5C9F F366 C9CF 2145 E770  B1B8 EFB1 462D A146 C380


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]