aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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