diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-09-17 18:12:43 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-09-17 18:12:43 +0000 |
| commit | 3bcf853d9aa0fdb734c3ce66b9688e45dd0a4e0e (patch) | |
| tree | 60b3f9944a988de93f1e1dca36df29f8f90ec396 /libjava | |
| parent | 6f6c3ae6b6039858f4dc7882f89f1344955a98c4 (diff) | |
| download | ppe42-gcc-3bcf853d9aa0fdb734c3ce66b9688e45dd0a4e0e.tar.gz ppe42-gcc-3bcf853d9aa0fdb734c3ce66b9688e45dd0a4e0e.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104370 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 7777f3a6bb9..0163f8de7a7 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 aa993b33127..c32330a2354 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*"] } { |
