From 9472124fb40edbebcd6283b8891e4524b400bdc1 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 15 Apr 2011 17:12:35 +0000 Subject: [PATCH] jni.exp (gcj_jni_get_cxxflags_invocation): Add $libiconv to cxxflags for alpha*-dec-osf*. * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add $libiconv to cxxflags for alpha*-dec-osf*. From-SVN: r172507 --- libjava/ChangeLog | 5 +++++ libjava/testsuite/libjava.jni/jni.exp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5bbcd6ebcae..ded4e7ce453 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2011-04-15 Rainer Orth + + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): + Add $libiconv to cxxflags for alpha*-dec-osf*. + 2011-04-12 Rainer Orth PR testsuite/21164 diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index ebdee1b44c9..c84d86f2f2a 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -280,6 +280,11 @@ proc gcj_jni_get_cxxflags_invocation {} { lappend cxxflags "-shared-libgcc" } + # Tru64 UNIX needs -liconv linked explicitly since gcc does the linking. + if { [istarget "alpha*-dec-osf*"] } { + lappend cxxflags $libiconv + } + return $cxxflags } -- 2.30.2