From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Mon, 9 May 2005 16:52:36 +0000 (+0100)
Subject: libjava.exp (libjava_find_gij): Use $objdir/..
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f4a355acbcb7123579f4d65ee524b939ceff4d0;p=gcc.git

libjava.exp (libjava_find_gij): Use $objdir/..

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

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

From-SVN: r99448
---

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index b3a16f67169..3d1c702f6f1 100644
--- 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 ""
     }