Commit f23d4dca by Thomas Fitzsimmons Committed by Thomas Fitzsimmons

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

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
parent 5270c302
2006-06-22 Thomas Fitzsimmons <fitzsim@redhat.com> 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 * Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to
toolexeclibdir. toolexeclibdir.
* Makefile.in: Regenerate. * Makefile.in: Regenerate.
......
...@@ -258,7 +258,7 @@ proc gcj_jni_invocation_test_one {file} { ...@@ -258,7 +258,7 @@ proc gcj_jni_invocation_test_one {file} {
# -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.
if { [istarget "*-*-darwin*"] } { if { [istarget "*-*-darwin*"] } {
set cxxflags "-L../.libs -shared-libgcc -lgcj -liconv" set cxxflags "-L../.libs -shared-libgcc -ljvm -liconv"
} else { } else {
global LIBJAVA global LIBJAVA
if [info exists LIBJAVA] { if [info exists LIBJAVA] {
...@@ -266,7 +266,7 @@ proc gcj_jni_invocation_test_one {file} { ...@@ -266,7 +266,7 @@ proc gcj_jni_invocation_test_one {file} {
} else { } else {
set libjava [libjava_find_lib libjava gcj] set libjava [libjava_find_lib libjava gcj]
} }
set cxxflags "$libjava -lgcj" set cxxflags "$libjava -ljvm"
} }
if { [istarget "*-*-solaris*"] } { if { [istarget "*-*-solaris*"] } {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment