diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c520438..173747f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2006-06-22 Thomas Fitzsimmons <fitzsim@redhat.com> + * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): + Link against -ljvm, not -lgcj. + +2006-06-22 Thomas Fitzsimmons <fitzsim@redhat.com> + * Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to toolexeclibdir. * Makefile.in: Regenerate. diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 6cd677d..0ed8a5a 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -258,7 +258,7 @@ proc gcj_jni_invocation_test_one {file} { # -dylib_file option, but that's complicated, and it's much easier # to just make the linker find libgcc using -L options. if { [istarget "*-*-darwin*"] } { - set cxxflags "-L../.libs -shared-libgcc -lgcj -liconv" + set cxxflags "-L../.libs -shared-libgcc -ljvm -liconv" } else { global LIBJAVA if [info exists LIBJAVA] { @@ -266,7 +266,7 @@ proc gcj_jni_invocation_test_one {file} { } else { set libjava [libjava_find_lib libjava gcj] } - set cxxflags "$libjava -lgcj" + set cxxflags "$libjava -ljvm" } if { [istarget "*-*-solaris*"] } { |