mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-24 19:01:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

jni.exp (gcj_jni_invocation_test_one): Link against -ljvm, not -lgcj.

Browse Source 
2006-06-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
	Link against -ljvm, not -lgcj.

From-SVN: r114902
This commit is contained in:
Thomas Fitzsimmons 2006-06-22 19:22:42 +00:00 committed by Thomas Fitzsimmons
parent 5270c302f0
commit f23d4dca7e
2 changed files with 7 additions and 2 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-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

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

@ -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*"] } {