summaryrefslogtreecommitdiffstats
path: root/libjava/testsuite/lib/libjava.exp
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-13 00:22:20 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-13 00:22:20 +0000
commite4f3768fda3bd13ede69f12ccdab494dc68dce29 (patch)
tree931755ba538c10a80231b5e1d84c4c62fe325abd /libjava/testsuite/lib/libjava.exp
parente6ec2049be149a39dee6b150c1eac08a416154ff (diff)
downloadppe42-gcc-e4f3768fda3bd13ede69f12ccdab494dc68dce29.tar.gz
ppe42-gcc-e4f3768fda3bd13ede69f12ccdab494dc68dce29.zip
Fix for PR libgcj/9139:
* lib/libjava.exp (find_javac): Put value of libgcj_jar into return value when gcj is used. * libjava.mauve/mauve.exp (test_mauve): Use libgcj_jar global. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61237 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
-rw-r--r--libjava/testsuite/lib/libjava.exp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index a807c4c8d60..9c8e664e67b 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation
load_lib "libgloss.exp"
@@ -74,7 +74,7 @@ proc find_gcjh {} {
}
proc find_javac {} {
- global SUN_JAVAC GCJ_UNDER_TEST env
+ global SUN_JAVAC GCJ_UNDER_TEST env libgcj_jar
# If JDK doesn't run on your platform but some other
# JDK-compatible javac does, you may set SUN_JAVAC to point to it.
# One of the most important properties of a SUN_JAVAC is that it
@@ -87,7 +87,7 @@ proc find_javac {} {
if {[info exists env(SUN_JAVAC)]} {
set SUN_JAVAC $env(SUN_JAVAC)
} else {
- set SUN_JAVAC "$GCJ_UNDER_TEST -C"
+ set SUN_JAVAC "$GCJ_UNDER_TEST -C -I$libgcj_jar"
}
}
return $SUN_JAVAC
OpenPOWER on IntegriCloud