procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR java/43839 (libjava incorrectly uses -liconv in testsuite, jni.exp when using --with-libiconv-prefix)

Browse source 
PR 43839
	* testsuite/Makefile.am: Override automake for site.exp creation
	and add entry to set libiconv.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
	Add new global variable libiconv to handle alternative libiconv
	locations.

From-SVN: r159009
This commit is contained in:
Jack Howarth 2010-05-03 22:37:50 +00:00 • committed by Mike Stump
parent cbb4feb38e
commit 7b39ef1488
4 changed files with 65 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/testsuite/libjava.jni/jni.exp
View file

@ -251,7 +251,11 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} {
}
proc gcj_jni_get_cxxflags_invocation {} {
global libiconv
global LIBJAVA
if {$libiconv == ""} {
set libiconv "-liconv"
}
if [info exists LIBJAVA] {
set libjava $LIBJAVA;
} else {
@ -267,7 +271,7 @@ proc gcj_jni_get_cxxflags_invocation {} {
# to just make the linker find libgcc using -L options.
# Similar logic applies to libgcj.
if { [istarget "*-*-darwin*"] } {
lappend cxxflags -shared-libgcc -lgcj -liconv
eval lappend cxxflags "-shared-libgcc -lgcj $libiconv"
}
if { [istarget "*-*-solaris*"] } {