2005-04-22 Bryce McKinlay <mckinlay@redhat.com>

	* testsuite/lib/libjava.exp (libjava_find_gij): Use $objdir/.. to
	find gij if get_multilibs fails.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99448 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index b3a16f6..3d1c702 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -278,6 +278,10 @@ proc libjava_find_gij {} {
     global base_dir objdir
 
     set gijdir [lookfor_file [get_multilibs] libjava];
+    # Fall back if get_multilibs fails.
+    if {$gijdir == ""} {
+      set gijdir "$objdir/.."
+    }
     if {! [file exists $gijdir/gij]} {
        return ""
     }