From 14692ceb6cd2c5e34bb7a517ae7f1f85bcde4179 Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 27 Mar 2002 16:27:06 +0000 Subject: [PATCH] 2002-03-27 Anthony Green * lib/libjava.exp: Add the wrapper link options only when we're linking. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51451 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/testsuite/ChangeLog | 5 +++++ libjava/testsuite/lib/libjava.exp | 18 ++++++++++-------- 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 + + * lib/libjava.exp: Add the wrapper link options only when we're + linking. + 2002-03-26 Tom Tromey * 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}" -- 2.7.4