summaryrefslogtreecommitdiff
path: root/libjava/testsuite/libjava.jni/jni.exp
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/testsuite/libjava.jni/jni.exp')
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp7
1 files changed, 3 insertions, 4 deletions
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index f052766b4f9..8dd8b8af049 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
}