Commit 954d4177 by Ulrich Weigand Committed by Ulrich Weigand

jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH to find libgcc_s.

	* libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
	to find libgcc_s.  Set JAVA_CLASSPATH to find libgcj.jar.

From-SVN: r62318
parent 4b445d7c
2003-02-03 Ulrich Weigand <uweigand@de.ibm.com>
* libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
to find libgcc_s. Set JAVA_CLASSPATH to find libgcj.jar.
2003-01-31 Mark Wielaard <mark@klomp.org> 2003-01-31 Mark Wielaard <mark@klomp.org>
* lib/libjava.exp (libjava_prune_warnings): Remove all unreachable * lib/libjava.exp (libjava_prune_warnings): Remove all unreachable
......
...@@ -14,6 +14,9 @@ proc gcj_jacks_setup_xfail {ary} { ...@@ -14,6 +14,9 @@ proc gcj_jacks_setup_xfail {ary} {
proc gcj_jacks_write {filename} { proc gcj_jacks_write {filename} {
global GCJ_UNDER_TEST global GCJ_UNDER_TEST
global libgcj_jar
global libjava_libgcc_s_path
global original_ld_library_path
set gcjl [split $GCJ_UNDER_TEST] set gcjl [split $GCJ_UNDER_TEST]
set gcj_cmd [lindex $gcjl 0] set gcj_cmd [lindex $gcjl 0]
...@@ -22,7 +25,7 @@ proc gcj_jacks_write {filename} { ...@@ -22,7 +25,7 @@ proc gcj_jacks_write {filename} {
set fd [open $filename w] set fd [open $filename w]
puts $fd "set JAVAC $gcj_cmd" puts $fd "set JAVAC $gcj_cmd"
puts $fd "set JAVA_CLASSPATH \"\"" puts $fd "set JAVA_CLASSPATH \"$libgcj_jar\""
puts $fd "set JAVAC_FLAGS [list $rest]" puts $fd "set JAVAC_FLAGS [list $rest]"
puts $fd "set JAVA [list [libjava_find_gij]]" puts $fd "set JAVA [list [libjava_find_gij]]"
puts $fd "set JAVA_FLAGS \"\"" puts $fd "set JAVA_FLAGS \"\""
...@@ -32,6 +35,8 @@ proc gcj_jacks_write {filename} { ...@@ -32,6 +35,8 @@ proc gcj_jacks_write {filename} {
# "Time-consuming JVM limitation tests". # "Time-consuming JVM limitation tests".
# puts $fd "set tcltest::testConstraints(jvm) 1" # puts $fd "set tcltest::testConstraints(jvm) 1"
close $fd close $fd
setenv LD_LIBRARY_PATH $libjava_libgcc_s_path:$original_ld_library_path
} }
proc gcj_jacks_parse {file} { proc gcj_jacks_parse {file} {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment