* testsuite/lib/libjava.exp (libjava_find_gij): Handle multilibs.

From-SVN: r92758

libjava/ChangeLog

+2004-12-31  Andreas Jaeger  <aj@suse.de>
+
+	* testsuite/lib/libjava.exp (libjava_find_gij): Handle multilibs.
+
 2004-12-20  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault):
@@ -15941,4 +15945,3 @@
 
 	* java/util/Date.java (parse):  Fix a number of problems.
 	(skipParens):  Remove no-longer-needed method.
-

libjava/testsuite/lib/libjava.exp

@@ -277,10 +277,11 @@ proc libjava_find_spec {} {
 proc libjava_find_gij {} {
     global base_dir objdir
 
-    if {! [file exists $objdir/../gij]} {
+    set gijdir [lookfor_file [get_multilibs] libjava];
+    if {! [file exists $gijdir/gij]} {
 	return ""
     }
-    return $objdir/../gij
+    return $gijdir/gij
 }
 
 # Remove a bunch of files.