move libiconv linkage from to libgcj_la_LDFLAGS

Message ID
State New
Headers show

Commit Message

Jack Howarth June 18, 2011, 5:51 a.m.
The attached patch moves the linkage on $(LDLIBICONV) from to a more correct
direct linkage on libgcj which contains the unresolved symbols. This change also solves problems
when a multilib only has libiconv for one of the two architectures (ie building gcc trunk on
x86_64 fink which lacks a i386 libiconv). Bootstrap and libjava regression tested on x86_64 darwin11.
Okay for gcc trunk?

2011-06-18  Jack Howarth <>

	* libjava/ Don't pass @LDLIBICONV@.
	* libjava/ (libgcj_la_LDFLAGS): Pass @LDLIBICONV@.
	* libjava/ Regenerate.


Index: libjava/
--- libjava/	(revision 175163)
+++ libjava/	(working copy)
@@ -7,6 +7,6 @@ 
 *startfile: @THREADSTARTFILESPEC@ %(startfileorig)
 %rename lib liborig
Index: libjava/
--- libjava/	(revision 175163)
+++ libjava/	(working copy)
@@ -492,7 +492,7 @@  xlib_nat_files = $(xlib_nat_source_files
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
 	-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
 libgcj_la_LIBADD = \
 	classpath/native/fdlibm/ \
 	java/lang/Object.lo \