From 6e1a435df002c87da258a71a64a43720b17d1631 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 17 Mar 2002 20:34:36 +0000 Subject: [PATCH] re PR other/5874 (gcc-3.1 20020304 (prerelease) FAILs in libjava testsuite with RUNTESTFLAGS="--target_board 'unix{-fPIC,-fpic,}'") * libjava.jni/jni.exp (gcj_jni_build_header): Use local_exec, not target_compile. Fixes PR other/5874. From-SVN: r50923 --- libjava/testsuite/ChangeLog | 5 +++++ 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 888546b10a3..fe5ed13786e 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-03-17 Tom Tromey + + * libjava.jni/jni.exp (gcj_jni_build_header): Use local_exec, not + target_compile. Fixes PR other/5874. + 2002-03-15 Eric Blake For PR java/5902: 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 } -- 2.30.2