summaryrefslogtreecommitdiffstats
path: root/libjava/testsuite/lib/libjava.exp
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-06-24 19:06:28 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-06-24 19:06:28 +0000
commitf27f59e4cf4f26bfb31e9f4ea4bc8a4a07d1b5c3 (patch)
tree1fe6becfca85f5b172eb9557a029e876d77ffc26 /libjava/testsuite/lib/libjava.exp
parentfb518a9a7884428c60a3191cd9048e60850f2d1d (diff)
downloadppe42-gcc-f27f59e4cf4f26bfb31e9f4ea4bc8a4a07d1b5c3.tar.gz
ppe42-gcc-f27f59e4cf4f26bfb31e9f4ea4bc8a4a07d1b5c3.zip
* lib/libjava.exp (libjava_arguments): If `libtool' not found in
build tree, just use $GCJ_UNDER_TEST as compiler. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27728 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
-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 88691a8663e..78818fc3715 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
}
OpenPOWER on IntegriCloud