diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-03 22:17:26 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-03 22:17:26 +0000 |
| commit | cc59a1f08d30c3ab3d540317c1c214b27774b8f0 (patch) | |
| tree | 12f45ba2e2910e4a0e6883509d1b01f351af8467 | |
| parent | b93ca75c5b1631c9f0ea5770c6408171aa80e695 (diff) | |
| download | gcc-cc59a1f08d30c3ab3d540317c1c214b27774b8f0.tar.gz | |
2005-03-03 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/20292
* testsuite/libjava.jni/jni.exp
(gcj_jni_invocation_compile_c_to_binary): Add -I. -I.. to compile
flags.
(gcj_jni_invocation_test_one): Add -L../.libs to cxx flags.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95848 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fb782674a05..e2f1c0516e0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-03-03 Thomas Fitzsimmons <fitzsim@redhat.com> + + PR libgcj/20292 + * testsuite/libjava.jni/jni.exp + (gcj_jni_invocation_compile_c_to_binary): Add -I. -I.. to compile + flags. + (gcj_jni_invocation_test_one): Add -L../.libs to cxx flags. + 2005-02-23 David Daney <ddaney@avtrex.com> * configure.host: Don't use -mxgot for MIPS builds. diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index d736b8690d6..fb10bd4b9e6 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -194,6 +194,9 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { set filename [file tail $file] set name [file rootname $filename] + # Find the generated header. + lappend options "additional_flags=-I. -I.." + # Find jni.h. lappend options "additional_flags=-I$srcdir/../include" @@ -235,7 +238,7 @@ proc gcj_jni_invocation_test_one {file} { pass "bytecompile $file" set cfile [file rootname $file].c - set cxxflags "-lgcj" + set cxxflags "-L../.libs -lgcj" if {! [gcj_jni_invocation_compile_c_to_binary $cfile $cxxflags]} { # FIXME |