aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorAnthony Green <green@redhat.com>2002-03-27 16:27:06 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-03-27 16:27:06 +0000
commit30cc8722743d42b734b0227f2f6dabb3cf3f2952 (patch)
tree38ee97af872dd91f4785612adcdad78d290ede4a /libjava
parent6dad5a56316443a832b581d384e1596fad690be1 (diff)
downloadgcc-30cc8722743d42b734b0227f2f6dabb3cf3f2952.zip
gcc-30cc8722743d42b734b0227f2f6dabb3cf3f2952.tar.gz
gcc-30cc8722743d42b734b0227f2f6dabb3cf3f2952.tar.bz2
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/testsuite/ChangeLog5
-rw-r--r--libjava/testsuite/lib/libjava.exp18
2 files changed, 15 insertions, 8 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 0ffe30c..097d0aa 100644
--- 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 50996aa..9367d22 100644
--- 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}"