aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite/lib
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/testsuite/lib')
-rw-r--r--libjava/testsuite/lib/libjava.exp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 88691a86..78818fc 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -200,15 +200,20 @@ proc libjava_arguments {{mode compile}} {
}
# Search for libtool. We need it to link.
+ set found_compiler 0
set d [absolute $objdir]
foreach x {. .. ../.. ../../..} {
if {[file exists $d/$x/libtool]} then {
# We have to run silently to avoid DejaGNU lossage.
lappend args \
"compiler=$d/$x/libtool --silent --mode=$mode $GCJ_UNDER_TEST"
+ set found_compiler 1
break
}
}
+ if {! $found_compiler} {
+ lappend args "compiler=$GCJ_UNDER_TEST"
+ }
return $args
}