From f27f59e4cf4f26bfb31e9f4ea4bc8a4a07d1b5c3 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 24 Jun 1999 19:06:28 +0000 Subject: * 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 --- libjava/testsuite/lib/libjava.exp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libjava/testsuite/lib/libjava.exp') 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 } -- cgit v1.2.3