diff options
author | Adam Megacz <megacz@cs.berkeley.edu> | 2006-12-21 18:07:33 +0000 |
---|---|---|
committer | Adam Megacz <megacz@gcc.gnu.org> | 2006-12-21 18:07:33 +0000 |
commit | 54076f8b4496139a59e4129850b6f4c6c72baca4 (patch) | |
tree | a926259541abcdeb915fe4588480128aec7421ce /libjava | |
parent | 225a58a7705d6b8117a616aae2002cfc698d70e0 (diff) | |
download | gcc-54076f8b4496139a59e4129850b6f4c6c72baca4.zip gcc-54076f8b4496139a59e4129850b6f4c6c72baca4.tar.gz gcc-54076f8b4496139a59e4129850b6f4c6c72baca4.tar.bz2 |
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
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 6 | ||||
-rwxr-xr-x | libjava/configure | 4 | ||||
-rw-r--r-- | libjava/configure.ac | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 122930b..3653a8d 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 4ee87df..fec6c34 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 a51e923..9e6b066 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}`/" |