libjava.exp: Add the wrapper link options only when we're linking.

2002-03-27  Anthony Green  <green@redhat.com>

	* lib/libjava.exp: Add the wrapper link options only when we're
	linking.

From-SVN: r51451

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 0ffe30c0c37ea16069bc7784ee35dc746b8e4e41..097d0aadf27955fb0bd5b484e52d18e0153ae5b6 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-27  Anthony Green  <green@redhat.com>
+
+       * lib/libjava.exp: Add the wrapper link options only when we're
+       linking.
+
 2002-03-26  Tom Tromey  <tromey@redhat.com>
 
        * libjava.mauve/mauve.exp (test_mauve): Use correct stderr

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 50996aa4ad913627471f5c4ad75eb4dfcee0f6c0..9367d22dfb4c8733802494aac93f67ad0bd0c0e5 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -296,14 +296,16 @@ proc libjava_arguments {{mode compile}} {
     global env
     set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
 
-    global wrapper_file wrap_compile_flags;
-    lappend args "additional_flags=$wrap_compile_flags";
-    lappend args "libs=$wrapper_file";
-    lappend args "libs=$libjava";
-    lappend args "libs=$libgc";
-    lappend args "libs=$libqthreads"
-    lappend args "libs=$libz"
-    lappend args debug
+    if {$mode == "link"} {
+       global wrapper_file wrap_compile_flags;
+       lappend args "additional_flags=$wrap_compile_flags";
+       lappend args "libs=$wrapper_file";
+       lappend args "libs=$libjava";
+       lappend args "libs=$libgc";
+       lappend args "libs=$libqthreads"
+       lappend args "libs=$libz"
+       lappend args debug
+    }
 
     if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {
        lappend args "libs=${gluefile}"