From 0de82be51731d649414f86d09f9cd3d672df8dda Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 28 Oct 2011 07:13:44 +0000 Subject: [PATCH] re PR ada/50842 (gnatmake fails to link in stage3 with undefined symbol _iconv_close) PR ada/50842 * gcc-interface/Makefile.in (SYMDEPS): Delete. (LIBICONV): New variable. (LIBICONV_DEP): Likewise. (LIBS): Add $(LIBICONV). (LIBDEPS): Add $(LIBICONV_DEP). (EXTRA_GNATTOOLS_OBJS): Merge into... (TOOLS_LIBS): ...this. Add $(LIBICONV). From-SVN: r180605 --- gcc/ada/ChangeLog | 10 ++++++++++ gcc/ada/gcc-interface/Makefile.in | 17 +++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7883ad6f8d6d..bacb37129b61 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2011-10-28 Eric Botcazou + + PR ada/50842 + * gcc-interface/Makefile.in (SYMDEPS): Delete. + (LIBICONV): New variable. + (LIBICONV_DEP): Likewise. + (LIBS): Add $(LIBICONV). + (LIBDEPS): Add $(LIBICONV_DEP). + (EXTRA_GNATTOOLS_OBJS): Merge into... + (TOOLS_LIBS): ...this. Add $(LIBICONV). 2011-10-26 Eric Botcazou diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index f2247d0f3430..990a69877363 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -121,7 +121,6 @@ THREAD_KIND = native THREADSLIB = GMEM_LIB = MISCLIB = -SYMDEPS = $(LIBINTL_DEP) OUTPUT_OPTION = @OUTPUT_OPTION@ objext = .o @@ -175,13 +174,13 @@ top_builddir = ../.. LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ +# Character encoding conversion library. +LIBICONV = @LIBICONV@ +LIBICONV_DEP = @LIBICONV_DEP@ + # Any system libraries needed just for GNAT. SYSLIBS = @GNAT_LIBEXC@ -# List of extra object files linked in with various programs. -EXTRA_GNATTOOLS_OBJS = ../../libcommon-target.a ../../libcommon.a \ - ../../../libcpp/libcpp.a - # List extra gnattools EXTRA_GNATTOOLS = @@ -242,11 +241,13 @@ LIBIBERTY = ../../libiberty/libiberty.a # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(LIBINTL) $(LIBIBERTY) $(SYSLIBS) -LIBDEPS = $(LIBINTL_DEP) $(LIBIBERTY) +LIBS = $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(SYSLIBS) +LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBIBERTY) # Default is no TGT_LIB; one might be passed down or something TGT_LIB = -TOOLS_LIBS = $(EXTRA_GNATTOOLS_OBJS) targext.o link.o $(LIBGNAT) $(LIBINTL) ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB) +TOOLS_LIBS = targext.o link.o ../../libcommon-target.a ../../libcommon.a \ + ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \ + ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB) # Convert the target variable into a space separated list of architecture, # manufacturer, and operating system and assign each of those to its own -- 2.47.2