This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix bootstrap after changes to libcpp (part 2)
- From: Roger Sayle <roger at eyesopen dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Andrew Pinski <pinski at physics dot ic dot edu>, Zack Weinberg <zack at codesourcery dot com>
- Date: Sun, 6 Jun 2004 08:23:33 -0600 (MDT)
- Subject: [PATCH] Fix bootstrap after changes to libcpp (part 2)
Although Andrew Pinski's patch fixes bootstrap on both
powerpc-apple-darwin and i386-unknown-freebsd4.9, its not enough
to cure the failure on i686-pc-cygwin. In addition to -lintl,
libcpp's makedepend also needs to link against -liconv. However,
thanks to Andrew's patch, I now know what the necessary fix looks
like.
The following patch allows bootstrap on i686-pc-cygwin to proceed past
the makedepend link failure in libcpp. I've not committed this as obvious
as I'm not sure this might not create problems on hosts without -liconv.
Ok for mainline?
[p.s. I think the AC_PREREQ(2.57) in libcpp/configure.ac needs to be
upgraded to 2.58, as libcpp/aclocal.m4 contains an AC_PREREQ(2.58).
Whilst investigating this problem, I upgraded autoconf to 2.57 on the
advice of the error message, only to be informed by a second error
that I need to upgrade again to 2.58!]
2004-06-06 Roger Sayle <roger@eyesopen.com>
Andrew Pinski <pinskia@physics.uc.edu>
* Makefile.am (LIBICONV): Declare.
(makedepend_LDADD): Use LIBICONV.
* Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libcpp/Makefile.am,v
retrieving revision 1.4
diff -c -3 -p -u -p -r1.4 Makefile.am
--- Makefile.am 6 Jun 2004 04:23:01 -0000 1.4
+++ Makefile.am 6 Jun 2004 13:55:42 -0000
@@ -14,8 +14,9 @@ noinst_HEADERS = \
include/symtab.h internal.h system.h ucnid.h
LIBINTL = @LIBINTL@
+LIBICONV = @LIBICONV@
noinst_PROGRAMS = makedepend
-makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL)
+makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) $(LIBICONV)
XGETTEXT = @XGETTEXT@
GMSGFMT = @GMSGFMT@
Roger
--
Roger Sayle, E-mail: roger@eyesopen.com
OpenEye Scientific Software, WWW: http://www.eyesopen.com/
Suite 1107, 3600 Cerrillos Road, Tel: (+1) 505-473-7385
Santa Fe, New Mexico, 87507. Fax: (+1) 505-473-0833