diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 68e38ecf2ba..dcc6d353fe0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-06  David.Billinghurst  <David.Billinghurst@riotinto.com>
+
+	* testsuite/lib/libjava.exp (libjava_arguments): Don't link
+	with -no-install on *-*-cygwin*.
+
 2002-05-06  David.Billinghurst  <David.Billinghurst@riotinto.com>
 
 	* testsuite/lib/libjava.exp (test_libjava_from_source):
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index fb23a718eac..e083fe05d97 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -368,8 +368,11 @@ proc libjava_arguments {{mode compile}} {
     }
 
     # Avoid libtool wrapper scripts when possible.
+    # but not if libtool warnings results in FAILs
     if {$mode == "link"} {
-        lappend args "additional_flags=-no-install"
+        if {! [istarget "*-*-cygwin*"]} {
+            lappend args "additional_flags=-no-install"
+        }
     }
 
     return $args