From fe574d5d92f83b0b34a8d4cb782f2885a28d3754 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 Jun 1999 19:06:28 +0000 Subject: [PATCH] libjava.exp (libjava_arguments): If `libtool' not found in build tree, just use $GCJ_UNDER_TEST as compiler. * lib/libjava.exp (libjava_arguments): If `libtool' not found in build tree, just use $GCJ_UNDER_TEST as compiler. From-SVN: r27728 --- libjava/testsuite/ChangeLog | 5 +++++ libjava/testsuite/lib/libjava.exp | 5 +++++ 2 files changed, 10 insertions(+) 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 + + * lib/libjava.exp (libjava_arguments): If `libtool' not found in + build tree, just use $GCJ_UNDER_TEST as compiler. + 1999-06-23 Tom Tromey * 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 } -- 2.30.2