jni.exp (gcj_jni_get_cxxflags_invocation): Add libiconv for FreeBSD to cxxflags.

2015-05-26  Andreas Tobler  <andreast@gcc.gnu.org>

    * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add
    libiconv for FreeBSD to cxxflags.

From-SVN: r223706

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 726c2eeebc3bade64c3d8239ac1ab5d9ac2420a2..9ad64284dce860cf882caa9de6f809c81d176cde 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-26  Andreas Tobler  <andreast@gcc.gnu.org>
+
+       * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add
+       libiconv for FreeBSD to cxxflags.
+
 2015-05-24  Eric Botcazou  <ebotcazou@adacore.com>
 
        * configure: Regenerate.

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index ebdee1b44c96c18cb7b7ec9fc5bf26d336d07346..8bd74481deb4e2c35c7fa4aa6e0b203a5c6351f6 100644 (file)
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -274,6 +274,11 @@ proc gcj_jni_get_cxxflags_invocation {} {
     eval lappend cxxflags "-shared-libgcc -lgcj $libiconv"
   }
 
+  # FreeBSD needs -liconv linked, otherwise we get some unresolved.
+  if { [istarget "*-*-freebsd*"] } {
+    eval lappend cxxflags "$libiconv"
+  }
+
   # Make sure libgcc unwinder is used on 64-bit Solaris 10+/x86 rather than
   # the libc one.
   if { [istarget "*-*-solaris*"] } {