diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 726c2ee..9ad6428 100644 --- 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 ebdee1b..8bd7448 100644 --- 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*"] } { |