From 9166f7a36ad696ddce1faecbed02a271587261dd Mon Sep 17 00:00:00 2001
From: Jeff Sturm <jsturm@one-point.com>
Date: Wed, 6 Jun 2001 02:53:52 +0000
Subject: [PATCH] libjava.exp (libjava_arguments): Build with `-no-install'
 when $mode == "link".

* lib/libjava.exp (libjava_arguments): Build with `-no-install'
when $mode == "link".

From-SVN: r42928
---
 libjava/testsuite/ChangeLog       | 5 +++++
 libjava/testsuite/lib/libjava.exp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 41ce7adbed5..769542954c3 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-05  Jeff Sturm  <jsturm@one-point.com>
+
+	* lib/libjava.exp (libjava_arguments): Build with `-no-install'
+	when $mode == "link".
+
 2001-06-02  Anthony Green  <green@redhat.com>
 
 	* libjava.lang/invokethrow.java: Fake a pass for systems which
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 4b797bfd04e..a9ec73eeefa 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -313,6 +313,11 @@ proc libjava_arguments {{mode compile}} {
 	lappend args "compiler=$GCJ_UNDER_TEST -B$objdir/../"
     }
 
+    # Avoid libtool wrapper scripts when possible.
+    if {$mode == "link"} {
+        lappend args "additional_flags=-no-install"
+    }
+
     return $args
 }
 
-- 
2.30.2