diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-09-11 19:38:31 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-09-11 19:38:31 +0000 |
| commit | 544456340be925b45f658c8517abc53fefd092b6 (patch) | |
| tree | 1a8bea5d9cd15c9ef39cb6a0e54b778f0da1ba9e /libjava/testsuite/libjava.jni | |
| parent | dd8982995c957bd6664abba15e9b846ad89f1837 (diff) | |
| parent | 7c928f726d68d925a0f5f6fe8843ebee7738963f (diff) | |
| download | gcc-544456340be925b45f658c8517abc53fefd092b6.zip gcc-544456340be925b45f658c8517abc53fefd092b6.tar.gz gcc-544456340be925b45f658c8517abc53fefd092b6.tar.bz2 | |
Merge from trunk revision 227689.
From-SVN: r227693
Diffstat (limited to 'libjava/testsuite/libjava.jni')
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 5 |
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*"] } { |