From 1379eb7c8e7a67ddef757b7724b9e4821acbd793 Mon Sep 17 00:00:00 2001 From: andreast Date: Tue, 26 May 2015 18:31:49 +0000 Subject: [PATCH] 2015-05-26 Andreas Tobler * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add libiconv for FreeBSD to cxxflags. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223706 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/testsuite/libjava.jni/jni.exp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 726c2eeebc3b..9ad64284dce8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2015-05-26 Andreas Tobler + + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add + libiconv for FreeBSD to cxxflags. + 2015-05-24 Eric Botcazou * configure: Regenerate. diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index ebdee1b44c96..8bd74481deb4 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*"] } { -- 2.47.2