jni.exp (gcj_jni_invocation_test_one): Use libjava_find_lib to find the proper libgcj.

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.

From-SVN: r104370

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7777f3a6bb900d08d63b34785aa4bdb81c160fe3..0163f8de7a782215a1c37d3545822f534878b45b 100644 (file)
--- 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 aa993b33127a0797a65faaa55b5b7e3ed2ff5cf3..c32330a23544d785250a71bd407b509a8ab955a0 100644 (file)
--- 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*"] } {