From d3992d8e283a2f5728e14e838e80a0fec47ed2ec Mon Sep 17 00:00:00 2001
From: aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 31 Dec 2004 12:34:18 +0000
Subject: 	* testsuite/lib/libjava.exp (libjava_find_gij): Handle
 multilibs.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92758 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/testsuite/lib/libjava.exp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libjava/testsuite/lib/libjava.exp')

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 71fffc53860..443259d712c 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/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.
-- 
cgit v1.2.3