OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jni.exp (gcj_jni_get_cxxflags_invocation): Add libiconv for FreeBSD to cxxflags.

Browse Source 
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
This commit is contained in:
Andreas Tobler 2015-05-26 20:31:49 +02:00
parent 815facd36d
commit 517d07c980
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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> 2015-05-24 Eric Botcazou <ebotcazou@adacore.com>
* configure: Regenerate. * configure: Regenerate.

5
libjava/testsuite/libjava.jni/jni.exp
View File

@ -274,6 +274,11 @@ proc gcj_jni_get_cxxflags_invocation {} {
eval lappend cxxflags "-shared-libgcc -lgcj $libiconv" 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 # Make sure libgcc unwinder is used on 64-bit Solaris 10+/x86 rather than
# the libc one. # the libc one.
if { [istarget "*-*-solaris*"] } { if { [istarget "*-*-solaris*"] } {