aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorRanjit Mathew <rmathew@gmail.com>2004-05-07 14:59:43 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2004-05-07 15:59:43 +0100
commit8e31e1284dfe9ea5183e3e2c94bf690a779ea32f (patch)
treec6505611b347b876636f6c8a494338f4423ba763 /libjava
parentbc21b3f34a127b4c9988d1d553146c47de381b3e (diff)
downloadgcc-8e31e1284dfe9ea5183e3e2c94bf690a779ea32f.zip
gcc-8e31e1284dfe9ea5183e3e2c94bf690a779ea32f.tar.gz
gcc-8e31e1284dfe9ea5183e3e2c94bf690a779ea32f.tar.bz2
jni.exp (gcj_jni_test_one): Don't link the main binary against the JNI shared library.
2004-05-07 Ranjit Mathew <rmathew@gmail.com> * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Don't link the main binary against the JNI shared library. From-SVN: r81622
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp4
2 files changed, 6 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ceaaa7b..022c6ee 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-07 Ranjit Mathew <rmathew@gmail.com>
+
+ * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Don't link the
+ main binary against the JNI shared library.
+
2004-05-07 Jerry Quinn <jlquinn@optonline.net>
* java/util/SimpleTimeZone.java (startTimeMode, endTimeMode,
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 3c9f3e4..5ca07ab 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -137,9 +137,7 @@ proc gcj_jni_test_one {file} {
return 0
}
- # We use -l$main because the .so is named the same as the main
- # program.
- set args [list "additional_flags=-fjni -L. -l$main"]
+ set args [list "additional_flags=-fjni"]
if {! [gcj_link $main $main $file $args]} {
# FIXME
return 0