OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jni.exp (gcj_jni_get_cxxflags_invocation): Make the testsuite multilib aware for Darwin.

Browse Source 
2007-12-06  Andreas Tobler  <a.tobler@schweiz.org>

	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Make
	the testsuite multilib aware for Darwin.

From-SVN: r130657
This commit is contained in:
Andreas Tobler 2007-12-06 19:23:05 +00:00 committed by Andreas Tobler
parent 97f6bd406c
commit f390e54eae
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-06 Andreas Tobler <a.tobler@schweiz.org>
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Make
the testsuite multilib aware for Darwin.
2007-12-05 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h: Regenerate.

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

@ -241,6 +241,14 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} {
}
proc gcj_jni_get_cxxflags_invocation {} {
global LIBJAVA
if [info exists LIBJAVA] {
set libjava $LIBJAVA;
} else {
set libjava [libjava_find_lib libjava gcj]
}
set cxxflags "$libjava -ljvm"
# Darwin needs -liconv linked, otherwise we get some unresolved.
# If you're building the compiler with --prefix set to a place
# where it's not yet installed, then the linker won't be able to
@ -249,15 +257,7 @@ proc gcj_jni_get_cxxflags_invocation {} {
# 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 -lgcj -liconv"
} else {
global LIBJAVA
if [info exists LIBJAVA] {
set libjava $LIBJAVA;
} else {
set libjava [libjava_find_lib libjava gcj]
}
set cxxflags "$libjava -ljvm"
lappend cxxflags -shared-libgcc -lgcj -liconv
}
if { [istarget "*-*-solaris*"] } {