diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b19398e..9a949d0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-09-01 Geoffrey Keating <geoffk@apple.com> + + * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): + Pass -lgcj to linker for C++ files on Darwin. + 2006-09-01 Keith Seitz <keiths@redhat.com> * jvmti.cc (THREAD_DEFAULT_TO_CURRENT): Encapsulate in do..while loop. diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 0ed8a5a..317c5ae 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -257,8 +257,9 @@ proc gcj_jni_invocation_test_one {file} { # find the libgcc used by libffi.dylib. We could pass the # -dylib_file option, but that's complicated, and it's much easier # to just make the linker find libgcc using -L options. + # Similar logic applies to libgcj. if { [istarget "*-*-darwin*"] } { - set cxxflags "-L../.libs -shared-libgcc -ljvm -liconv" + set cxxflags "-L../.libs -shared-libgcc -ljvm -lgcj -liconv" } else { global LIBJAVA if [info exists LIBJAVA] { |