summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-28 12:08:28 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-28 12:08:28 +0000
commit15b82c1f69dc894cb620c0160cd0d1eab2f5999c (patch)
tree6ad7aaff69dcf4ddd19ca7512518a9bb7b6718ea /libjava
parent320d4d0a0d5b61339654ed386dbc95a74a9d232e (diff)
downloadgcc-15b82c1f69dc894cb620c0160cd0d1eab2f5999c.tar.gz
* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add
libsocket to the libraries to link for Solaris. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97130 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp4
2 files changed, 10 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 24faa64a22d..01d0f8b1ab1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-28 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add
+ libsocket to the libraries to link for Solaris.
+
2005-03-28 Per Bothner <per@bothner.com>
* boehm.cc (_Jv_MarkObj): Don't follow null pointer to static field,
@@ -21125,3 +21130,4 @@
* java/util/Date.java (parse): Fix a number of problems.
(skipParens): Remove no-longer-needed method.
+
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index b2df3126983..201daaca713 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -251,6 +251,10 @@ proc gcj_jni_invocation_test_one {file} {
set cxxflags "-L../.libs -lgcj"
}
+ if { [istarget "*-*-solaris*"] } {
+ lappend cxxflags "-lsocket"
+ }
+
if {! [gcj_jni_invocation_compile_c_to_binary $cfile $cxxflags]} {
# FIXME
return 0