diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 0ffe30c0c37..097d0aadf27 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 50996aa4ad9..9367d22dfb4 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}" |