diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-17 06:45:40 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-17 06:45:40 +0000 |
| commit | 6eaf95e6c45898be861b64cf24ceec17a3212627 (patch) | |
| tree | 1e36e81bd573f55c33c4d7f66e8e3f5bc6477c09 /libjava | |
| parent | 9e915256178a175dfa1e23102ae8dac9048f1ce7 (diff) | |
| download | gcc-6eaf95e6c45898be861b64cf24ceec17a3212627.tar.gz | |
* lib/libjava.exp (bytecompile_file): Don't unset CLASSPATH.
(libjava_arguments): Use .jar extension for libgcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39085 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 6f3ca8d01a5..ab8f5b13ca1 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-01-16 Richard Henderson <rth@redhat.com> + + * lib/libjava.exp (bytecompile_file): Don't unset CLASSPATH. + (libjava_arguments): Use .jar extension for libgcj. + 2001-01-08 Bryce McKinlay <bryce@albatross.co.nz> * libjava.compile/SuperConstr.java: New test case. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 085fdc2b618..101871e9055 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -82,7 +82,6 @@ proc bytecompile_file { file objdir {classpath {}} } { set dirname [file dirname $file] set javac [find_javac] - catch {unset env(CLASSPATH)} if {$classpath != ""} then { set env(CLASSPATH) $classpath } @@ -253,9 +252,9 @@ proc libjava_arguments {{mode compile}} { setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path" # Set the CLASSPATH environment variable - verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip" + verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar" global env - set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip" + set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar" global wrapper_file wrap_compile_flags; lappend args "additional_flags=$wrap_compile_flags"; |