From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Thu, 21 Dec 2006 18:07:33 +0000 (+0000)
Subject: configure.ac: add $built_gcc_dir to $GCJH and $GCJ when crossbuilding.
X-Git-Tag: releases/gcc-4.3.0~7872
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54076f8b4496139a59e4129850b6f4c6c72baca4;p=thirdparty%2Fgcc.git

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

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

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

From-SVN: r120115
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 122930b79121..3653a8df5d76 100644
--- 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 4ee87df76f80..fec6c34b9a3d 100755
--- 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 a51e923f10ef..9e6b06635e84 100644
--- 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}`/"