From 75f7b21567d8c366482b35a957d860f9b1c2c3e0 Mon Sep 17 00:00:00 2001 From: andreast Date: Thu, 6 Dec 2007 19:23:05 +0000 Subject: [PATCH] 2007-12-06 Andreas Tobler * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Make the testsuite multilib aware for Darwin. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130657 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/testsuite/libjava.jni/jni.exp | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 31b06d9..1c96742 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Andreas Tobler + + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Make + the testsuite multilib aware for Darwin. + 2007-12-05 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h: Regenerate. diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 623597c..4ed27cd 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -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*"] } { -- 2.7.4