aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite/lib
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@gcc.gnu.org>2005-05-09 17:52:36 +0100
committerBryce McKinlay <bryce@gcc.gnu.org>2005-05-09 17:52:36 +0100
commit1f4a355acbcb7123579f4d65ee524b939ceff4d0 (patch)
tree0d1c8daa86714dd36ae8228d694a761a2b1cb005 /libjava/testsuite/lib
parentc3d4c143385db2cafb4215c87c0ee17dcc20146d (diff)
downloadgcc-1f4a355acbcb7123579f4d65ee524b939ceff4d0.zip
gcc-1f4a355acbcb7123579f4d65ee524b939ceff4d0.tar.gz
gcc-1f4a355acbcb7123579f4d65ee524b939ceff4d0.tar.bz2
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
Diffstat (limited to 'libjava/testsuite/lib')
-rw-r--r--libjava/testsuite/lib/libjava.exp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index b3a16f6..3d1c702 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 ""
}