libjava.exp (gcc_version): Removed.
2002-08-16 H.J. Lu <hjl@gnu.org> * lib/libjava.exp (gcc_version): Removed. (libgcj_jar): New. (libjava_init): Set libgcj_jar with tcl glob. (libjava_arguments): Use libgcj_jar. From-SVN: r56382
This commit is contained in:
parent
fdf68669ec
commit
400639e641
|
@ -1,3 +1,10 @@
|
||||||
|
2002-08-16 H.J. Lu <hjl@gnu.org>
|
||||||
|
|
||||||
|
* lib/libjava.exp (gcc_version): Removed.
|
||||||
|
(libgcj_jar): New.
|
||||||
|
(libjava_init): Set libgcj_jar with tcl glob.
|
||||||
|
(libjava_arguments): Use libgcj_jar.
|
||||||
|
|
||||||
2002-07-22 Tom Tromey <tromey@redhat.com>
|
2002-07-22 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
* libjava.compile/zeroexp.java: New file.
|
* libjava.compile/zeroexp.java: New file.
|
||||||
|
|
|
@ -112,7 +112,7 @@ proc libjava_init { args } {
|
||||||
global TOOL_EXECUTABLE
|
global TOOL_EXECUTABLE
|
||||||
global original_ld_library_path
|
global original_ld_library_path
|
||||||
global env objdir
|
global env objdir
|
||||||
global env gcc_version
|
global env libgcj_jar
|
||||||
global tool_root_dir
|
global tool_root_dir
|
||||||
global libjava_libgcc_s_path
|
global libjava_libgcc_s_path
|
||||||
|
|
||||||
|
@ -130,10 +130,9 @@ proc libjava_init { args } {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Determine the version so we can find the libgcj jar file.
|
# Find the libgcj jar file.
|
||||||
set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"]
|
set libgcj_jar [glob $objdir/../libgcj-*.jar]
|
||||||
regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version
|
verbose "jar file is $libgcj_jar"
|
||||||
verbose "jar file is libgcj-$gcc_version.jar"
|
|
||||||
|
|
||||||
# FIXME: This finds libgcj.spec for the default multilib.
|
# FIXME: This finds libgcj.spec for the default multilib.
|
||||||
# If thread models differ between multilibs, this has to be moved
|
# If thread models differ between multilibs, this has to be moved
|
||||||
|
@ -292,7 +291,7 @@ proc libjava_arguments {{mode compile}} {
|
||||||
global runtests
|
global runtests
|
||||||
global env
|
global env
|
||||||
global tool_root_dir
|
global tool_root_dir
|
||||||
global gcc_version
|
global libgcj_jar
|
||||||
global libjava_libgcc_s_path
|
global libjava_libgcc_s_path
|
||||||
|
|
||||||
if [info exists LIBJAVA] {
|
if [info exists LIBJAVA] {
|
||||||
|
@ -358,9 +357,9 @@ proc libjava_arguments {{mode compile}} {
|
||||||
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
|
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
|
||||||
|
|
||||||
# Set the CLASSPATH environment variable
|
# Set the CLASSPATH environment variable
|
||||||
verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
|
verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$libgcj_jar"
|
||||||
global env
|
global env
|
||||||
set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
|
set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar"
|
||||||
|
|
||||||
if {$mode == "link"} {
|
if {$mode == "link"} {
|
||||||
global wrapper_file wrap_compile_flags;
|
global wrapper_file wrap_compile_flags;
|
||||||
|
|
Loading…
Reference in New Issue