2006-12-20 Adam Megacz <megacz@cs.berkeley.edu>

	* configure.ac: add $built_gcc_dir to $GCJH and $GCJ when
	crossbuilding.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120115 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 122930b..3653a8d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-20  Adam Megacz <megacz@cs.berkeley.edu>
+
+       * configure.ac: add $built_gcc_dir to $GCJH and $GCJ when
+       crossbuilding.
+        * configure: Regenerate.
+
 2006-12-18  Adam Megacz <megacz@cs.berkeley.edu>
 
         * Makefile.am: remove @X_CFLAGS@ from AM_CXXFLAGS; it causes

diff --git a/libjava/configure b/libjava/configure
index 4ee87df..fec6c34 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -5016,9 +5016,9 @@ case "${which_gcj}" in
          GCC_UNWIND_INCLUDE=
          GCJ="${target_noncanonical}-gcj"
       else
-         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
+         GCJ="$built_gcc_dir/gcj -B$built_gcc_dir/"
       fi
-      GCJH='$(target_noncanonical)-gcjh'
+      GCJH="$built_gcc_dir/gcjh"
    ;;
    path)
       GCJ="gcj -B`${PWDCMD-pwd}`/"

diff --git a/libjava/configure.ac b/libjava/configure.ac
index a51e923..9e6b066 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -323,9 +323,9 @@ case "${which_gcj}" in
          GCC_UNWIND_INCLUDE=
          GCJ="${target_noncanonical}-gcj"
       else
-         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
+         GCJ="$built_gcc_dir/gcj -B$built_gcc_dir/"
       fi
-      GCJH='$(target_noncanonical)-gcjh'
+      GCJH="$built_gcc_dir/gcjh"
    ;;
    path)
       GCJ="gcj -B`${PWDCMD-pwd}`/"