git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jni.exp (gcj_jni_invocation_test_one): Pass -lgcj to linker for C++ files on Darwin. 

* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
	Pass -lgcj to linker for C++ files on Darwin.

From-SVN: r116639
This commit is contained in:
Geoffrey Keating 2006-09-01 19:52:10 +00:00 committed by Geoffrey Keating
parent 4860b87477
commit cd709ec369
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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> 2006-09-01 Keith Seitz <keiths@redhat.com>
* jvmti.cc (THREAD_DEFAULT_TO_CURRENT): Encapsulate in do..while loop. * jvmti.cc (THREAD_DEFAULT_TO_CURRENT): Encapsulate in do..while loop.

3
libjava/testsuite/libjava.jni/jni.exp
View File

@ -257,8 +257,9 @@ proc gcj_jni_invocation_test_one {file} {
# find the libgcc used by libffi.dylib. We could pass the # find the libgcc used by libffi.dylib. We could pass the
# -dylib_file option, but that's complicated, and it's much easier # -dylib_file option, but that's complicated, and it's much easier
# to just make the linker find libgcc using -L options. # to just make the linker find libgcc using -L options.
# Similar logic applies to libgcj.
if { [istarget "*-*-darwin*"] } { if { [istarget "*-*-darwin*"] } {
set cxxflags "-L../.libs -shared-libgcc -ljvm -liconv" set cxxflags "-L../.libs -shared-libgcc -ljvm -lgcj -liconv"
} else { } else {
global LIBJAVA global LIBJAVA
if [info exists LIBJAVA] { if [info exists LIBJAVA] {