toolchain/gcc/4.3.3/410-prefer-GCJ_FOR_ECJX-from-env.patch

   1 If you want to use e.g. gcj-4.4-local for building ecj for your host
   2 and do not have a $cross_host-gcj then bootstrap previously failed.
   3
   4 libjava/ChangeLog
   5 2009-02-20  Bernhard Reutner-Fischer  <>
   6
   7         * configure.ac (GCJ_FOR_ECJX): Allow override from environment.
   8         * configure: Regenerate.
   9
  10 diff -rdup gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
  11 --- gcc-4.3.3.orig/libjava/configure    2009-01-24 11:32:29.000000000 +0100
  12 +++ gcc-4.3.3/libjava/configure 2009-02-20 16:19:18.000000000 +0100
  13 @@ -5273,14 +5273,15 @@ NATIVE=yes
  14  # Which gcj and host gcj (for ecjx) do we use?
  15  which_gcj=default
  16  host_exeext=${ac_exeext}
  17 -GCJ_FOR_ECJX=
  18 +GCJ_FOR_ECJX=${GCJ_FOR_ECJX}
  19  built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
  20  if test -n "${with_cross_host}"; then
  21    # We are being configured with a cross compiler. We can't
  22    # use ac_exeext, because that is for the target platform.
  23    NATIVE=no
  24    cross_host_exeext=
  25 -  GCJ_FOR_ECJX="${with_cross_host}-gcj"
  26 +  test "x${GCJ_FOR_ECJX}" = "x" &&
  27 +    GCJ_FOR_ECJX="${with_cross_host}-gcj"
  28    case "${with_cross_host}" in
  29       *mingw* | *cygwin*)
  30           cross_host_exeext=.exe
  31 diff -rdup gcc-4.3.3.orig/libjava/configure.ac gcc-4.3.3/libjava/configure.ac
  32 --- gcc-4.3.3.orig/libjava/configure.ac 2008-07-02 23:23:43.000000000 +0200
  33 +++ gcc-4.3.3/libjava/configure.ac      2009-02-20 16:19:25.000000000 +0100
  34 @@ -313,14 +313,15 @@ NATIVE=yes
  35  # Which gcj and host gcj (for ecjx) do we use?
  36  which_gcj=default
  37  host_exeext=${ac_exeext}
  38 -GCJ_FOR_ECJX=
  39 +GCJ_FOR_ECJX=${GCJ_FOR_ECJX}
  40  built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
  41  if test -n "${with_cross_host}"; then
  42    # We are being configured with a cross compiler. We can't
  43    # use ac_exeext, because that is for the target platform.
  44    NATIVE=no
  45    cross_host_exeext=
  46 -  GCJ_FOR_ECJX="${with_cross_host}-gcj"
  47 +  test "x${GCJ_FOR_ECJX}" = "x" &&
  48 +    GCJ_FOR_ECJX="${with_cross_host}-gcj"
  49    case "${with_cross_host}" in
  50       *mingw* | *cygwin*)
  51           cross_host_exeext=.exe