2007-01-31 Andreas Tobler <a.tobler@schweiz.org>

	* testsuite/libjava.jvmti/jvmti-interp.exp (gij_jvmti_test_one): Add
	-shared-libgcc to the cxxflaglist for Darwin.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121438 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 15 insertions, 3 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3dd1dfaaec3..3ae5d1942d7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* testsuite/libjava.jvmti/jvmti-interp.exp (gij_jvmti_test_one): Add
+	-shared-libgcc to the cxxflaglist for Darwin.
+
 2007-01-31  Tom Tromey  <tromey@redhat.com>
 
 	* scripts.am, Makefile.in: Rebuilt.
diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
index 0c0fca1137e..73a05822005 100644
--- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
@@ -112,9 +112,16 @@ proc gij_jvmti_test_one {file} {
           # directory of it to the cxxflaglist.
           lappend cxxflaglist "-L$cxxldlibflags"
       }
-	
-      lappend cxxflaglist "-lstdc++"
-
+      # 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
+      # find the libgcc used by libgcj.dylib/libstdc++.dylib. We could pass
+      # the -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*"] } {
+	  lappend cxxflaglist "-shared-libgcc -lstdc++"
+      } else {
+	  lappend cxxflaglist "-lstdc++"
+      }
       set cxxflags [join $cxxflaglist]
   }