aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite/libjava.jni
diff options
context:
space:
mode:
authorAndreas Tobler <andreast@gcc.gnu.org>2015-05-26 20:31:49 +0200
committerAndreas Tobler <andreast@gcc.gnu.org>2015-05-26 20:31:49 +0200
commit517d07c980163ac34d7bf41e3e8d8dbaa38843df (patch)
tree33ea9ac2c39fb7303f123e20b7b870c0f5d74ed3 /libjava/testsuite/libjava.jni
parent815facd36d5342079199ae644ccdb2e052c83a72 (diff)
downloadgcc-517d07c980163ac34d7bf41e3e8d8dbaa38843df.zip
gcc-517d07c980163ac34d7bf41e3e8d8dbaa38843df.tar.gz
gcc-517d07c980163ac34d7bf41e3e8d8dbaa38843df.tar.bz2
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
Diffstat (limited to 'libjava/testsuite/libjava.jni')
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp5
1 files changed, 5 insertions, 0 deletions
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*"] } {