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

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 31b06d9db9832471f0f5964b097af891b9670913..1c96742e35c1e8bc3ada5fdff534ea21499ff3ac 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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.

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 623597c36e98302f09b9f7ae1377cbf29676e349..4ed27cdf0d1192e0ac121d4b46b00f15747a8f0c 100644 (file)
--- 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*"] } {