From 3fb90446b48b875877c4f09c0085fe59b836bbfe Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 17 Sep 2005 18:12:43 +0000 Subject: jni.exp (gcj_jni_invocation_test_one): Use libjava_find_lib to find the proper libgcj. 2005-09-17 H.J. Lu * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Use libjava_find_lib to find the proper libgcj. From-SVN: r104370 --- libjava/testsuite/libjava.jni/jni.exp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libjava/testsuite') 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*"] } { -- cgit v1.1