diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7777f3a..0163f8d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-09-17 H.J. Lu <hongjiu.lu@intel.com> + + * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): + Use libjava_find_lib to find the proper libgcj. + 2005-09-16 Anthony Green <green@redhat.com> PR libgcj/20198 diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index aa993b3..c32330a 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -248,7 +248,13 @@ proc gcj_jni_invocation_test_one {file} { if { [istarget "*-*-darwin*"] } { set cxxflags "-L../.libs -lgcc_s -lgcj -liconv" } else { - set cxxflags "-L../.libs -lgcj" + global LIBJAVA + if [info exists LIBJAVA] { + set libjava $LIBJAVA; + } else { + set libjava [libjava_find_lib libjava gcj] + } + set cxxflags "$libjava -lgcj" } if { [istarget "*-*-solaris*"] } { |