summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2005-05-09 16:52:36 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2005-05-09 16:52:36 +0000
commit0ffef8c53f1dc8bd9776df057079e28f526cdf34 (patch)
tree0d1c8daa86714dd36ae8228d694a761a2b1cb005 /libjava
parentade4cc171946f0ac8cecd5bd4036ce246ab67c6d (diff)
downloadgcc-0ffef8c53f1dc8bd9776df057079e28f526cdf34.tar.gz
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
Diffstat (limited to 'libjava')
-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 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 ""
}