diff options
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index a55985af5aa..bbac0eaca9a 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -112,7 +112,7 @@ proc libjava_init { args } { global TOOL_EXECUTABLE global original_ld_library_path global env objdir - global env gcc_version + global env libgcj_jar global tool_root_dir global libjava_libgcc_s_path @@ -130,10 +130,9 @@ proc libjava_init { args } { } } - # Determine the version so we can find the libgcj jar file. - set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"] - regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version - verbose "jar file is libgcj-$gcc_version.jar" + # Find the libgcj jar file. + set libgcj_jar [glob $objdir/../libgcj-*.jar] + verbose "jar file is $libgcj_jar" # FIXME: This finds libgcj.spec for the default multilib. # If thread models differ between multilibs, this has to be moved @@ -292,7 +291,7 @@ proc libjava_arguments {{mode compile}} { global runtests global env global tool_root_dir - global gcc_version + global libgcj_jar global libjava_libgcc_s_path if [info exists LIBJAVA] { @@ -358,9 +357,9 @@ proc libjava_arguments {{mode compile}} { verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" # 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 - set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar" + set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar" if {$mode == "link"} { global wrapper_file wrap_compile_flags; |
