diff options
| -rw-r--r-- | libjava/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 888546b..fe5ed13 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-03-17 Tom Tromey <tromey@redhat.com> + + * libjava.jni/jni.exp (gcj_jni_build_header): Use local_exec, not + target_compile. Fixes PR other/5874. + 2002-03-15 Eric Blake <ebb9@email.byu.edu> For PR java/5902: diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index f052766..8dd8b8a 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -30,11 +30,10 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { proc gcj_jni_build_header {file} { set gcjh [find_gcjh] set file [file rootname $file] - set options [list "compiler=$gcjh" \ - "additional_flags=-jni"] - set x [prune_warnings [target_compile $file "" none $options]] + set x [string trim [prune_warnings \ + [lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]] if {$x != ""} { - verbose "target_compile failed: $x" 2 + verbose "local_exec failed: $x" 2 fail "$file header generation" return 0 } |