FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libjava.exp (bytecompile_file): Don't unset CLASSPATH.

Browse source 
* lib/libjava.exp (bytecompile_file): Don't unset CLASSPATH.
        (libjava_arguments): Use .jar extension for libgcj.

From-SVN: r39085
This commit is contained in:
Richard Henderson 2001-01-16 22:45:40 -08:00 • committed by Richard Henderson
parent dc3799c144
commit c99a2d3137
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/testsuite/ChangeLog
View file

@ -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> 2001-01-08 Bryce McKinlay <bryce@albatross.co.nz>
* libjava.compile/SuperConstr.java: New test case. * libjava.compile/SuperConstr.java: New test case.

5
libjava/testsuite/lib/libjava.exp
View file

@ -82,7 +82,6 @@ proc bytecompile_file { file objdir {classpath {}} } {
set dirname [file dirname $file] set dirname [file dirname $file]
set javac [find_javac] set javac [find_javac]
catch {unset env(CLASSPATH)}
if {$classpath != ""} then { if {$classpath != ""} then {
set env(CLASSPATH) $classpath set env(CLASSPATH) $classpath
} }
@ -253,9 +252,9 @@ proc libjava_arguments {{mode compile}} {
setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path" setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
# Set the CLASSPATH environment variable # 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 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; global wrapper_file wrap_compile_flags;
lappend args "additional_flags=$wrap_compile_flags"; lappend args "additional_flags=$wrap_compile_flags";