* 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

2 files changed, 10 insertions, 0 deletions

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index fd52a13a05e..47e493d2c00 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-24  Tom Tromey  <tromey@cygnus.com>
+
+	* lib/libjava.exp (libjava_arguments): If `libtool' not found in
+	build tree, just use $GCJ_UNDER_TEST as compiler.
+
 1999-06-23  Tom Tromey  <tromey@cygnus.com>
 
 	* lib/libjava.exp (libjava_arguments): Handle -lzgcj.
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
 }