diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-26 18:31:49 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-26 18:31:49 +0000 |
| commit | 1379eb7c8e7a67ddef757b7724b9e4821acbd793 (patch) | |
| tree | 33ea9ac2c39fb7303f123e20b7b870c0f5d74ed3 /libjava | |
| parent | 0d344d274041f6e6d4ff585144f55954f19c5439 (diff) | |
| download | gcc-1379eb7c8e7a67ddef757b7724b9e4821acbd793.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223706 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 726c2eeebc3..9ad64284dce 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 ebdee1b44c9..8bd74481deb 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*"] } { |